Add latest strings for translation

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

29 files changed, 48528 insertions, 20999 deletions

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index 463209d0a..a529f4165 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="bg_BG" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Отмяна</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Превключи при</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Кликнете тук за да изтриете бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Бутилката не може да бъде премахната</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркането могат да бъдат премахнати.</translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Водолазен костюм</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Водач</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Партньор</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Видимост</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Бележки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Тагове</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Тежести</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Бутилки</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Модел</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Име на устройство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Прякор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Кликнете тук за да изтриете този гмуркачески компютър.</translation>
     </message>
@@ -122,14 +695,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/м</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@
         <translation>Покажи Търсене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Свиване на други</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Изтрий гмуркане (гмуркания) от пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Създай ново пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Слей пътуване с горно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Слей пътуване с долно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Изтрий гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Маркирай гмуркания (гмуркане) като невалидни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Слей избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Преномерирай гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Измести времена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Зареди изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Отвори изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Избрани гмуркания</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Всички гмуркания</translation>
     </message>
@@ -277,11 +842,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Минимален Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Експортирай гмуркания</translation>
@@ -302,143 +862,148 @@
         <translation>Subsurface числа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Експортирай само списъка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Стилови настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Големина на шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Светла</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Пясък</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлове (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV файлове (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Стойности разделени с запетая, които съдържат най-важната информация относно гмуркаческия профил.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Изпрати данните от гмуркането към сайта divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML формат</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Експорт на като UDDF файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Експорт на СSV файл като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Експорт на световна карта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлове (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Експорт на Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML файлове (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Експортирай HTML файлове като</translation>
     </message>
@@ -628,42 +1193,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Финална дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Teчащо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Използван газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC поставена точка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Изтрий плана?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Вие ще изтриете плана.</translation>
     </message>
@@ -671,17 +1236,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Точки в гмуркачески плановик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Достъпни газове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Добави точка в гмуркането</translation>
     </message>
@@ -762,67 +1327,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Мин.</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Бут.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/м</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>паунда</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>паунда</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>няма избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>не може да бъде създаден ZIP файл за качване: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>не може да бъде създаден временен файл: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>вътрешна грешка: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>вътрешна грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Обновяване на списъка от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Изтегляне на списък от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Изтегляне на %1 гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Изтеглянето приключи - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Неправилно изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Архива не може да бъде отворен:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Грешка при качването</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Успешно качване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Грешка при логин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Не може да бъде направен разбор на отговора</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Грешка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Качването приключи</translation>
     </message>
@@ -948,32 +1543,32 @@
         <translation>Намери Uemis леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Изберете регистър файл при изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Регистър файлове (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Изберете файл за libdivecomputer дъмп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Дъмп файлове (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Запиши libdivecomputer дъмп файл</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -1091,27 +1704,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Темп. на въздух</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Темп. на водата</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
@@ -1258,67 +1871,61 @@
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Tемп. на въздуха [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Темп. на водата [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Това пътуване се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Редактира се повече от едно гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Това гмуркане се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Бележки за пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Местонахождение на пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Най-дълбоко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Най-плитко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Изтрий промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Вие ще изтриете промените.</translation>
     </message>
@@ -1345,82 +1952,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Превключи pHе диаграма</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Превключи калкулация на всички тъкани</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Превключи отчетен таван на гмуркачески компютър</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Превключи калкулиран таван</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Превключи NDL. TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Превключи калкулиран таван с 3м нарастване</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Превключи показване на пулс</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Превключи MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Превключи EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Превключи SAC скорост</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Превключи линеал</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Превключи тумбнаили на картината</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Детайли за гмуркачески план&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Напечатай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Изглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Вмъкване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Нов регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Отвори регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>З&amp;апиши като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Запиши като...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>На&amp;стройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Вмъкни &amp;GPS данни от Subsurface уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Профил</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Следващ ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Глобус</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;Вмъкни от divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Цял екран</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Превключи цял екран</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Експорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Експорт на гмуркачески регистри</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Промени скалата на дълбочинната ос</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Напечатай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Изход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Изтегли от леководолазен &amp;компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Преномерирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Превключи pО₂ диаграма</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Превключи pN₂ диаграма</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Редактирай имена на устройства</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Добави гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Автоматично &amp;групиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Годишни &amp;статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Списък на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>&amp;Предишен ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Ляво</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Дясно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Ръководство за &amp;потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>&amp;Планирай гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Вмъкни регистър файлове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Вмъкни регистър файлове от други приложения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Отвори файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Напечатай рунтайм таблица</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Годишни статистики</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Запиши промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Запиши файла като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Отвори регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Регистър файлове (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation>
     </message>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>фута/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Последен стоп на 20фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% средна дълбочина до 20фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20фута то повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% средна дълбочина до 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6м до повърхността</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>По подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Единици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Диаграма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Език</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Мрежа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Големина на шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>По подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Анимации</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Скорост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Изтрий всички настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Върни всики настройки по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Състема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>метър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>литра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>кб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>целзии</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>фаренхайт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>По подразбиране на системата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Прокси тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Изисква автентификация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Потребителско име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Списъци и таблици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Файл по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Невалиден дисплей</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Бутилка по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Използвай бутилка по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Потребителски ID по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Запази потребителски ID локално</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Обем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Единици за време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Минути</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Секунди</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Покажи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow на макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Общи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Знаменател за скорост на изкачване/спускане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Праг при показване на pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Праг при показване на pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Праг при показване на pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Макс. pO₂ при показване на MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Покажи таван на гмуркачески компютър в червено</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Покажи неизползвани бутилки в екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Покажи средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Нужен рестарт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Отвори файла по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Напечатай</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface не може да намери инсталирани принтери на тази система!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Гмуркане №%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Макс. дълбочина: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Времетраене: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Използван газ:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Тагове:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Тежести:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Бележки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Водач:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Партньор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Водолазен костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Видимост:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Оценка:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (№%1 от %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Направи първи гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Изтрий този гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Добави промяна на газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Добави бележка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Премахни събитие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Премахни малки събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Редактирай име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Покажи всички събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Скрий събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Скрий всички %1 събития?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Премахни избраните събития?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Редактирай име в показалец</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Потребителско име:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation> Името е прекалено дълго!</translation>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>Въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Изтрий тази точка</translation>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Грешен отговор от сървъра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Грешен XML отговор. Ред %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Свръзване...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Изтеглянето приключи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Грешка при изтеглянето: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Грешка при връзка: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Успешно изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Грешен потребителски ключ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation>Въведете потребителски ID и натиснете &quot;Изтегли&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Не може да бъде напревен разряд!</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>мл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>Моля проверете интернет връзката си.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Вие използватe последната версия на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Има нова версия на Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3701,85 @@ p, li { white-space: pre-wrap; }
         <translation>Следната информация за вашата система ще бъде изпратена също</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Операционна система: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU архитектура: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Език: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Да ви попитаме ли по-късно?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Не ме питайте отново</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Попитайте ме отново</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Изпрати потребителско изследване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Да ви попитаме отново?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Изпрати</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU архитектура %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface не успя да изпрати потребителското изследване.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Грешка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Моля проверете интернет връзката си.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Потребителското изследване изпратено успешно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3787,12 @@ OS CPU архитектура %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -3182,12 +3840,12 @@ OS CPU архитектура %1</translation>
         <translation>Качи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Времето за операцията изтече</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Трансфер на данни...</translation>
     </message>
@@ -3195,97 +3853,110 @@ OS CPU архитектура %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Кликнете тук за да изтриете система за тежест.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Година
  &gt; Месец / Пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Продължителност
 Общо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Най-късо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Най-дълго</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Дълбочина (%1)
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Темп. (%1)
@@ -3295,87 +3966,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>паскала</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>м/сек</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>фута/мин</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>фута/сек</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
@@ -3417,229 +4087,229 @@ Maximum</source>
         <translation>Максималният потдържан брой на CSV колони е %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>няма</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>деко. стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>покачване</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>таван</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>натовареност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>предавател</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>бележка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>повърхност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>безопасен стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>смяна на газ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>безопасен стоп (свободен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>безопасен стоп (задължителен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>дълбочина на спиране</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>таван (безопасен стоп)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>под</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>време за въздух</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>посока</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>внимание: ниво на тъканта</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>нон стоп време</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>грешен номер на събитие</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Грешка при регистриране на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Грешка при разряд на дата и час</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Гмуркане №%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
@@ -3651,19 +4321,19 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Не може да бъде напревен разбор на &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Базата данни не може да изпълни get_events.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Базата данни не може да изпълни get_tags.
@@ -3677,36 +4347,36 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Грешка при заява към база данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Базата данни не може да изпълни get_cylinders.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Базата данни не може да изпълни get_changes.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Базата данни не може да изпълни get_profile_sample.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Не може да бъде отворен стилов файл %s</translation>
     </message>
@@ -3716,136 +4386,136 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Не може да бъде намерен газ %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Твърде много газови смеси</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Калкулирането на декомпресия е прекратено заради дълга продължителност</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>базирано на GFlow = %d и GFHigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface гмуркачески план</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>дълбочина</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>времетраене</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>продължителност</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>газ</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dмин</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Превключи газ на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Консумация на газ:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Предупреждение:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>има повече газ от този на разположение в избраната бултилка</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3854,70 +4524,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3926,7 +4596,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3935,14 +4605,14 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Стоп: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Стоп: неопр. време @ %.0f%s
@@ -3950,77 +4620,77 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: неопр. време @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>В Deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %uмин @ %.0f%s (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>В Deco (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Калкулиран таван %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Тъкан %.0fмин: %.0f%s
@@ -4028,171 +4698,171 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>пулс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>лагер: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d мин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 гмуркане)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>кораб</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>бряг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>дрейф</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>дълбоко</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>каверна</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>лед</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>останки</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>пещера</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>височина</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>басейн</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>езеро</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>река</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>вечер</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>нов</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>студент</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>снимка</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>видео</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>инструктор</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>деко</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4242,97 +4912,97 @@ EADD: %d%s
         <translation>(няма гмуркания)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Ср</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Съб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Ян</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Март</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Юни</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Юли</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Сеп</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -4367,92 +5037,92 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Четене на гмуркане %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>данни</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>идент. за вписване в регистъра</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>идент. за вписване на местонахождение</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>повече данни за гмуркане</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>мокър костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>полусух</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>сух костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>къс</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>жилетка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>лонг джон</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>яке</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>пълен косюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 за цял костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>мембрана</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Започни връзка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis не може да бъде зареден</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Започни теглене</translation>
     </message>
@@ -4547,12 +5217,279 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>Тревога: слаба батерия</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Не може да бъде отворен файл %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Темп. на въздух</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Темп. на водата</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Статистика</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Видимост</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Партньор</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Водолазен костюм</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Тагове</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Бележки</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Годишни статистики</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Година</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Общо време</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Мин. дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Макс. дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Мин. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Макс. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Мин. темп.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Макс. темп.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Тежест</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Координати</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Дата:</translation>
@@ -4674,37 +5611,43 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Спускане до първа дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Планирай &quot;бекгас брейкс&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Газ настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Долен SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Деко SAC</translation>
     </message>
@@ -4719,27 +5662,33 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>Деко pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Покажи времетраене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Покажи времетраене на сегментацията</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Покажи транзиции в декомпресията</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Дословен гмуркачески план</translation>
     </message>
@@ -4765,17 +5714,17 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>6м до повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Покажи времетраене (абсолютно време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Покажи времетраене (oтносително време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 64bc873cb..fe98724f1 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Fortryd</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Skift ved</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik her vil fjerne flasken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasken kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Lokation</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Dragt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Makker</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Bedømmelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Sigtbarhed</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Noter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Vægt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Flasker </translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Enheds ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Kaldenavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klik her vil fjerne denne dykkercomputer.</translation>
     </message>
@@ -122,14 +695,6 @@ fjerne den valgte dykkercomputer?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Vis søge boks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Udvid alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Skjul alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Saml andre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Fjern dyk fra tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Opret ny tur over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Flet tur med turen over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Flet tur med turen under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Slet dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marker dyk som ugyldige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Flet valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Gen-Numerer dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Skift tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Indlæs billeder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Åben billed filer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ fjerne den valgte dykkercomputer?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Valgte dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Alle dyk</translation>
     </message>
@@ -277,11 +842,6 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exporter log filer</translation>
@@ -302,143 +862,148 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Subsurface numre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Eksporter kun listen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Udseende muligheder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Font størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Lys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Komma separeret værdier der indeholder de mest betydende informationer fra dykker profilen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface originale XML format</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Eksporter UDDF fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Eksporter CSV fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Eksporter verdens kort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Eksporter Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exporter HTML filer som</translation>
     </message>
@@ -628,42 +1193,42 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Slut dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Brugt gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Drop planen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Du er ved at droppe din plan.</translation>
     </message>
@@ -671,17 +1236,17 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Planlægnings punkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Gas til rådighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Tilføj punkt</translation>
     </message>
@@ -762,67 +1327,97 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Bedømmelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Mins</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>ingen dyk var valgt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>Kan ikke danne midlertidig fil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>Intern fejl: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>Intern fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Færdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Uploader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Downloader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Downloader %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Download færdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Fejl i download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Upload fejlede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Uploadet med succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Login fejlede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke fortolke svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Fejl: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Upload færdig</translation>
     </message>
@@ -948,32 +1543,32 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Find Uemis dykker computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Logfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump filer (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ fjerne den valgte dykkercomputer?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Gem dumpfil fra libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ fjerne den valgte dykkercomputer?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Position</translation>
     </message>
@@ -1091,27 +1704,27 @@ fjerne den valgte dykkercomputer?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Luft temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Vand temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
@@ -1258,67 +1871,61 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Luft temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Vand temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Turen er ved at blive rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flere dyk bliver rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Dette dyk bliver rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Tur notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Tur lokation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>Ukendt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Dybeste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Laveste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ blandes fra Luft ved brug:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>og</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Drop ændringerne?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Du er ved at droppe dine ændringer.</translation>
     </message>
@@ -1345,82 +1952,97 @@ blandes fra Luft ved brug:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Skift pH2 graf</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Skift beregning af alle væv</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Skift DC rapporteret loft</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Skift beregnet loft</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Skift NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Skift beregnet loft med 3m stop</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Skift hjerte frekvens</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Skift MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Skift EAD,END,EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Skift SAC rate</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Skift måler</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dykkerplan detaljer&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Udskriv:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny logbog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Crtl-N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Åben logbog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Åben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Crtl-O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Crtl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Ge&amp;m som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Gem som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>I&amp;ndstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importer &amp;GPS data fra Subsurface webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Næste DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importer fra divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fuld skærm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Skift fuld skærm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Tjek for opdateringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksporter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Eksporter log filerne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl-E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Skaler dybde aksen</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Print</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afslut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer fra &amp;dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Re-Nummerer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Skift pO₂ graf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Skift pN₂ graf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Editer device navne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Tilføj dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Auto &amp;grupering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Årlig statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Dykker liste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Fo&amp;rige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Højre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>&amp;Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>&amp;Planlæg dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importer logfiler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importer dykkerlog fra andre programmer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Åben fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Print runtime skema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Årlig statistik</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Gem ændringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Gem fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Åben log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Dykkerlog filer (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML filer (*.xml);;UDDF/UDCF filer(*.uddf *.udcf);;JDiveLog filer(*.jlb);;Suunto Filer(*.sde *.db);;CSV Filer(*.csv);;Alle Filer(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>f/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Sidste stop på 20f</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Sidste stop på 6 meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Enheder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Sprog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Netværk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Font størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Brug standard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animationer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Hastighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Nulstil alle indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Sæt alle indstillinger til default værdier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personliggør</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>System standard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Kræver godkendelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Lister og tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Standard log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Ugyldigt display</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Standard flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Brug standard flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface web service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Standard bruger ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Gem bruger ID lokalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Tids enheder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow på max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Op/Nedstignings hastigheds nævner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Tærskel ved visning af pO2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Tærskel ved visning af pN2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Tærskel ved visning af pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Maks pO₂ ved visning af  MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Tegn dykker computer rapporteret loft rødt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Vis ubrugte flasker i Udstyrs fanebladet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Vis gennemsnits dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHøj</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Genstart nødvendigt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Åben standard log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Udskriv:</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface kan ikke finde installerede printere på denne computer</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Dyk#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Varighed: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Brugt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Vægt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Noter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Makker:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Dragt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Sigt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 af %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Vælg som 1. dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Slet denne dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Tilføj gas skift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Tilføj bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Slet hændelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Skjul tilsvarende hændelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Vis alle hændelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Skjul hændelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Skjul alle %1 hændelser?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Fjern de valgte hændelser?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Rediger bogmærke navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Brugerdefineret navn:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Fjern dette punkt</translation>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Ugyldigt svar fra serveren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ugyldig XML svar. Linje %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Forbinder...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Download færdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Download fejl; %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Forbindelse fejl:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Download succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruger id</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke fortolke svar!</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>Tjek din internet forbindelse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Du har den nyeste version af Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;En nye version af Subsurface er tilgængelig.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3701,85 @@ p, li { white-space: pre-wrap; }
         <translation>Efterstående information omkring dit system vil også blive sendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operativ System: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Sprog: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Skal vi spørge dig senere?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Spørg ikke igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Spørg senere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Gem undersøgelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Spørg igen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Send</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Følgende fejl opstod:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Tjek din internet forbindelselse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Undersøgelsen er sendt med succes.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3787,12 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3840,12 @@ OS CPU Arkitektur: %1</translation>
         <translation>Upload</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Tiden er udløbet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -3195,97 +3853,110 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Et klik her vil fjerne dette vægt system.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt;Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Varighed
 Ialt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Længst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dybde (%1)
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3295,87 +3966,86 @@ Gennemsnit</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>f/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>f/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>pund (lbs)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -3417,229 +4087,229 @@ Gennemsnit</translation>
         <translation>Maksimum antal kolonner i CSV import er %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>opstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>Loft</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>Arbejdsbyrde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>Overtrædelse</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>bogmærke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>overflade</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>sikkerhedsstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gasskifte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>Sikkerhedsstop (frivillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>Sikkerhedsstop (Krævet)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>dybe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>Loft (sikkerhedsstop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>Under gulv</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Maks. dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>Lufttid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>Overskrift</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Vævs advarsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>Ugyldigt hændelses nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Fejl i registrering af data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Fejl ved fortolkning af dato/tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Dyk %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Fejl i fortolkning af dykkertid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fejl i fortolkning af max dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fejl ved at opnå overflade tryk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Fejl i fortolkning af prøver</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Fejl: registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fejl: registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Import fejl i dykker data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan ikke danne libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kan ikke åbne %s %s (%s)</translation>
     </message>
@@ -3651,19 +4321,19 @@ Gennemsnit</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Database forespørgsel get_events fejlede
  </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Database query get_tags failed.
@@ -3677,36 +4347,36 @@ Gennemsnit</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database forespørgsel fejlede &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Database query get_cylinders failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Database query get_changes failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Database query get_profile_sample failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan ikke åbne stylesheet %s</translation>
     </message>
@@ -3716,136 +4386,136 @@ Gennemsnit</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kan ikke finde gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>For mange gas blandinger</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>ANSVARSFRISKRIVELSE: Dette er en ny implementering af BUHLMANN algoritmen og dykkerplaner og har kun haft begrænset tests. Vi anbefaler der stærkt at der ikke planlægges dyk ALENE baseret på dette resultat.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykker plan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>varighed</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Skift gas til %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gas forbrug:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Advarsel:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3855,7 +4525,7 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
@@ -3863,21 +4533,21 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
@@ -3885,42 +4555,42 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3929,7 +4599,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3938,258 +4608,258 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>In deko (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beregnet loft %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Væv %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>Hjertefrekvens: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>bærende: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s
 </translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>Båd</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>Kyst</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>Strøm</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>hule</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>is</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>vrag</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>Højde</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>svømmehal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>sø</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>flod</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>Fersk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>Elev</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>Instruktør</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4239,97 +4909,97 @@ EADD: %d%s
         <translation>(ingen dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -4364,92 +5034,92 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Læser %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>Dykkerlog indgang id</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>Dykkersted data id</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>Flere dykker data id</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>våddragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>tørdragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>Long John</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>Jakke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>heldragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2-delt heldragt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Init Communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis start op fejlede</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Begynd download</translation>
     </message>
@@ -4544,12 +5214,279 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>Lav batteri alarm</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan ikke åbne filen %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Lokation</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Luft temperatur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Vandtemperatur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistik</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Bedømmelse</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Sigtbarhed</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Makker</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Dragt</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Noter</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Årlig statistik</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>År</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Total tid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min dybde</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max dybde</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min Temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Størrelse</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Vægt</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinater</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Dato:</translation>
@@ -4671,37 +5608,43 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Gå til første dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Sidste stop på 6 meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Planlæg gasbreaks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gas muligheder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Bund SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
@@ -4716,27 +5659,33 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>Deco pO2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Dyk notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Vis runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Vis etappe varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Vis overgange i deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4762,17 +5711,17 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 3e3112d01..908effda9 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="de_CH" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Wechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Dieses Gas wird verwendet. Nur Flaschen, die nicht im Tauchgang verwendet werden, können entfernt werden.</translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Stichworte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Blei</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Flaschen</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -80,22 +653,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -121,14 +694,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -136,87 +701,87 @@
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Entferne Tauchgäng(e) aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Reise mit der darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Reise mit der darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Tauchgäng(e) löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Tauchgäng(e) als ungültig markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Tauchgänge neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Bilder laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Öffne Bilddateien</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -260,13 +825,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Ausgewählte Tauchgänge</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Alle Tauchgänge</translation>
     </message>
@@ -276,11 +841,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exportiere Tauchlog Dateien</translation>
@@ -301,143 +861,148 @@
         <translation>Subsurface Nummern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Nur Liste exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Stiloptionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Motiv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Licht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV Dateien (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Kommagetrennte Werte, welche die relevantesten Informationen des Tauchprofils enthalten.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Tauchdaten an divelogs.de senden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-Export der Tauchplätze, auf einer Weltkarte visualisiert.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Natives Subsurface XML-Format</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>UDDF-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>CSV-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exportiere Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML Dateien (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>HTML-Datei exportieren als</translation>
     </message>
@@ -627,42 +1192,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Diese Planung verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -670,17 +1235,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
@@ -761,67 +1326,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Minuten</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>US Pfund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -829,95 +1424,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>ein Fehler ist aufgetreten: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Übertrage Liste der Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Übertragung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Übertragung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Login fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Übertragung beendet</translation>
     </message>
@@ -947,32 +1542,32 @@
         <translation>Finde Uemis Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Datei auswählen, in die das libdivecomputer Log gespeichert wird</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Log Dateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert wird</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -1036,6 +1631,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1049,7 +1662,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -1090,27 +1703,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -1257,67 +1870,61 @@
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemperatur [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Wassertemperatur [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Ziel der Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Tiefster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Seichtester Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1326,17 +1933,17 @@ werden aus Luft und
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
@@ -1344,82 +1951,97 @@ werden aus Luft und
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>pHe Kurve ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Berechnung aller Gewebe ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Pulsrate ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>MOD ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>SAC Rate ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Lineal ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Bildvorschau ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Tauchplan Details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1432,454 +2054,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>GPS Daten vom Subsurface Webservice importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>von Divelogs.de importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Vollbild Umschalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Nach neuer Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>Exportiere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exportiere Tauchlogs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Tiefenachse neu skalieren</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>pO₂ Kurve ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>pN₂ Kurve ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Gerätenamen bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Automatisch &amp;gruppieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Tauchgangliste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Tauchgang planen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Importiere Log-Dateien</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importiere Tauchlogdateien von anderen Anwendungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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 das Logbuch geschlossen werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Zeige Laufzeit Tabelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Öffne Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Tauchlog Dateien (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Dateien (*.xml);;UDDF/UDCF Dateien(*.uddf *.udcf);;JDiveLog Dateien(*.jlb);;Suunto Dateien(*.sde *.db);;CSV Files(*.csv);;Alle Dateien(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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 ein neues Logbuch geöffnet werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1887,380 +2505,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Letzter Stopp auf 20 Fuss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% mitlerer Tiefe bis 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% mitlerer Tiefe bis 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m bis Oberfläche</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Einheiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Diagramm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Systemeinstellung verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Alle Einstellungen zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Alle Einstellungen auf Standardwert setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>Fuss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Anmeldung erforderlich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listen und Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Standard Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Auch ungültige anzeigen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Standardflasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Standardflasche verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Standard Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Benutzerkennung lokal speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Schwellenwert bei pO₂ Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Schwellenwert bei pN₂ Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Schwellenwert bei pHe Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>max pO₂ bei MOD Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Durchschnittstiefe anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GF high</translation>
     </message>
@@ -2285,32 +2915,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Standard Logfile öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
@@ -2332,49 +2962,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface kann keinen Drucker finden!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Guide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2437,72 +3067,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Stichworte:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -2510,82 +3140,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 von %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Primärer Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Lösche diesen Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Name ist zu lang!</translation>
     </message>
@@ -2598,7 +3228,7 @@ p, li { white-space: pre-wrap; }
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Diesen Punkt entfernen</translation>
     </message>
@@ -2623,72 +3253,85 @@ p, li { white-space: pre-wrap; }
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Ungültige Serverantwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2848,47 +3491,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation>Benutzername eingeben und Herunterladen klicken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
@@ -2904,17 +3547,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2950,22 +3593,32 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte Internet-Verbindung überprüfen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Dies ist die neuste Version von Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Eine neuere Subsurface-Version kann hier heruntergeladen werden&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Eine neue Subsurface-Version wurde freigegeben.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3047,77 +3700,82 @@ p, li { white-space: pre-wrap; }
         <translation>Die folgenden Systeminformationen werden ebenfalls übertragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>Betriebssystem %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>Prozessor Architektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>Sprache: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <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="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Fragt mich nicht mehr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Später nochmal fragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Unfrageergebnis übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Fragt noch einmal?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Senden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Prozessor Architektur (laut Betriebsystem): %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Internet-Verbindung überprüfen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Benutzerumfrage erfolgreich übertragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3125,12 +3783,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3178,12 +3836,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Übertrage Daten...</translation>
     </message>
@@ -3191,97 +3849,110 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3291,87 +3962,86 @@ Mittel</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
@@ -3413,229 +4083,229 @@ Mittel</translation>
         <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>Aufstieg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>Arbeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>unterhalb Dekotiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen der Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
@@ -3647,19 +4317,19 @@ Mittel</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_tags&apos; fehlgeschlagen.
@@ -3673,36 +4343,36 @@ Mittel</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_cylinders&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_changes&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_profile_sample&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
@@ -3712,136 +4382,136 @@ Mittel</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kann Gas %s nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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 IMPLEMENTIERUNG DES &quot;BÜHLMANN ZH-L16&quot;-ALGORITHMUS UND EINES DARAUF AUFBAUENDEN TAUCHGANGPLANERS, 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>basierend auf GFlow = %d und GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface Tauchplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Aufstieg nach %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="606"/>
+        <location filename="../planner.c" line="595"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Beib auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Gaswechsel zu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gasverbrauch:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Warnung:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Keine ausreichende Reserver für Aufstieg unter Wechselatmung!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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 während geplantem Aufstieg)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3850,70 +4520,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3922,7 +4592,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3931,262 +4601,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Gewebe %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>Boot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>Ufer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>Strömung</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>tief</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>Kaverne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>Eis</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>Wrack</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>Höhle</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>Berg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>Pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>See</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>Nacht</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>süss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>Schüler</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>Instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4236,97 +4906,97 @@ EADD: %d%s
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -4361,92 +5031,92 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Lese %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>Logbucheintrag mit ID</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>Tauchplatz Daten ID</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>mehr Daten für Tauchgang ID</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>Weste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Verbindung aufbauen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Beginne zu Laden</translation>
     </message>
@@ -4541,12 +5211,279 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Alarm: Batterie schwach</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kann Datei %s nicht öffnen</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Wassertemperatur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistiken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Stichworte</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Jahr</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Gesamtzeit</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min. Temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max. Temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Grösse</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinaten</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -4668,37 +5605,43 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Direkter Abstieg zur ersten Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Plane backgas Pausen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gas Optionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
@@ -4713,27 +5656,33 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Deko pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Zeige runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Zeige Segmentdauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Aufstiege in der Deko anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>ausführlicher Tauchplan</translation>
     </message>
@@ -4759,17 +5708,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zeige runtime (absolute Zeit) der Stops im Tauchplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Zeige Dauer (relative Zeit) der Stops im Tauchplan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 7af81073e..8aa5374be 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Wechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Tauchgruppenleiter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Tauchpartner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Stichworte</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Blei</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Flaschen</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -80,22 +653,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -121,14 +694,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -136,87 +701,87 @@
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Entferne Tauchgäng(e) aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Reise mit der darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Reise mit der darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Tauchgäng(e) löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Tauchgäng(e) als ungültig markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Tauchgänge neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Bilder laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Öffne Bilddateien</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -260,13 +825,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Ausgewählte Tauchgänge</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Alle Tauchgänge</translation>
     </message>
@@ -276,11 +841,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exportiere Tauchlog Dateien</translation>
@@ -301,143 +861,148 @@
         <translation>Subsurface Nummern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Nur Liste exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Stiloptionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Schriftgröße</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Motiv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Licht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV Dateien (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Kommagetrennte Werte, welche die relevantesten Informationen des Tauchprofils enthalten.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Tauchdaten an divelogs.de senden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-Export der Tauchplätze, auf einer Weltkarte visualisiert.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Natives Subsurface XML-Format</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>UDDF-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>CSV-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exportiere Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML Dateien (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>HTML-Datei exportieren als</translation>
     </message>
@@ -627,42 +1192,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Diese Planung verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -670,17 +1235,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
@@ -761,67 +1326,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Minuten</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>AMV</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>US Pfund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -829,95 +1424,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>ein Fehler ist aufgetreten: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Übertrage Liste der Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Übertragung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Übertragung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Login fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Übertragung beendet</translation>
     </message>
@@ -947,32 +1542,32 @@
         <translation>Finde Uemis Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Datei auswählen, in die das libdivecomputer Log gespeichert wird</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Log Dateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -1036,6 +1631,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1049,7 +1662,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -1090,27 +1703,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Wassertemp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -1257,67 +1870,61 @@
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Wassertemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Ziel der Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Tiefster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Flachster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1326,17 +1933,17 @@ den folgenden Gasen gemischt werden:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
@@ -1344,82 +1951,97 @@ den folgenden Gasen gemischt werden:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>pHe Kurve ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Berechnung aller Gewebe ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Pulsrate ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>MOD ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>AMV Rate ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Lineal ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Miniaturansicht der Bilder ein-/ausschalten</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Tauchplan Details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1432,454 +2054,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Strg+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Strg+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>GPS Daten vom Subsurface Webservice importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Strg+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>von Divelogs.de importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Vollbild Umschalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Nach neuer Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>Exportiere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exportiere Tauchlogs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Tiefenachse neu skalieren</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Strg+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Strg+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Strg++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Strg+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Strg+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Strg+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Strg+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>pO₂ Kurve ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>pN₂ Kurve ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Strg+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Gerätenamen bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Automatisch &amp;gruppieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Tauchgangliste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Strg+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Strg+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Strg+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Strg+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Strg+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Tauchgang planen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Importiere Log-Dateien</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importiere Tauchlogdateien von anderen Anwendungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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 das Logbuch geschlossen werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Zeige Laufzeit Tabelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Öffne Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Tauchlog Dateien (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Dateien (*.xml);;UDDF/UDCF Dateien(*.uddf *.udcf);;JDiveLog Dateien(*.jlb);;Suunto Dateien(*.sde *.db);;CSV Files(*.csv);;Alle Dateien(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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 ein neues Logbuch geöffnet werden kann.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1887,380 +2505,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Letzter Stopp auf 20 Fuß</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% mitlerer Tiefe bis 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% mitlerer Tiefe bis 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m bis Oberfläche</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Einheiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Diagramm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Standardeinstellungen verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Geschwindigkeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Alle Einstellungen zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Alle Einstellungen auf Standardwert setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>Fuß</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>Liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Anmeldung erforderlich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listen und Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Standard Tauchlog Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Auch ungültige anzeigen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Standardflasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Standardflasche verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Standard Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Benutzerkennung lokal speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Schwellenwert bei pO₂ Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Schwellenwert bei pN₂ Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Schwellenwert bei pHe Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>max pO₂ bei MOD Anzeige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Durchschnittstiefe anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GF high</translation>
     </message>
@@ -2285,32 +2915,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Standard Logfile öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
@@ -2332,49 +2962,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface kann keine installierten Drucker finden!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Guide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2437,72 +3067,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr. %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Stichworte:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>AMV:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -2510,82 +3140,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 von %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Primärer Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Lösche diesen Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Der Name ist zu lang!</translation>
     </message>
@@ -2598,7 +3228,7 @@ p, li { white-space: pre-wrap; }
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Diesen Punkt entfernen</translation>
     </message>
@@ -2623,72 +3253,85 @@ p, li { white-space: pre-wrap; }
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Ungültige Serverantwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2848,47 +3491,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation>Benutzerkennung eingeben und Herunterladen klicken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
@@ -2904,17 +3547,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2950,22 +3593,32 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte Internet-Verbindung überprüfen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Dies ist die neuste Version von Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Eine neuere Subsurface-Version kann hier heruntergeladen werden&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Eine neue Subsurface-Version wurde freigegeben.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3047,80 +3700,85 @@ p, li { white-space: pre-wrap; }
         <translation>Die folgenden Systeminformationen werden ebenfalls übertragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Betriebssystem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Prozessor Architektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Sprache: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <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="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Fragt mich nicht mehr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Später nochmal fragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Unfrageergebnis übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Fragt noch einmal?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Senden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Prozessor Architektur (laut Betriebsystem): %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Internet-Verbindung überprüfen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Benutzerumfrage erfolgreich übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3128,12 +3786,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3181,12 +3839,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Übertrage Daten...</translation>
     </message>
@@ -3194,97 +3852,110 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>AMV (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3294,87 +3965,86 @@ Durchschnitt</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
@@ -3416,229 +4086,229 @@ Durchschnitt</translation>
         <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>Aufstieg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>Arbeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>unterhalb Dekotiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
@@ -3650,19 +4320,19 @@ Durchschnitt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_events&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_tags&apos; fehlgeschlagen.
@@ -3676,36 +4346,36 @@ Durchschnitt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_cylinders&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_changes&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Datenbank Anfrage &apos;get_profile_sample&apos; fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
@@ -3715,136 +4385,136 @@ Durchschnitt</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kann Gas %s nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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 IMPLEMENTIERUNG DES &quot;BÜHLMANN ZH-L16&quot;-ALGORITHMUS UND EINES DARAUF AUFBAUENDEN TAUCHGANGPLANERS, 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>basierend auf GFlow = %d und GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface Tauchplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Gaswechsel zu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CND</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gasverbrauch:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Warnung:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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 während geplantem Aufstieg)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s während des geplanten Aufstiegs) von %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3853,70 +4523,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>AMV: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3925,7 +4595,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3934,262 +4604,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Gewebe %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>Boot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>Ufer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>Strömung</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>tief</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>Kaverne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>Eis</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>Wrack</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>Höhle</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>Berg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>Pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>See</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>Nacht</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>süss</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>Schüler</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>Tauchlehrer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>Deko</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4239,97 +4909,97 @@ EADD: %d%s
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -4364,92 +5034,92 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Lese %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>Logbucheintrag mit ID</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>Tauchplatz Daten ID</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>mehr Daten für Tauchgang ID</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>Weste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Verbindung aufbauen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Beginne zu Laden</translation>
     </message>
@@ -4544,12 +5214,279 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Alarm: Batterie schwach</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kann Datei %s nicht öffnen</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Wassertemperatur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistiken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Tauchpartner</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Stichworte</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Jahr</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Gesamtzeit</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min. AMV</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max. AMV</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min. Temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max. Temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Größe</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation>Betriebsdruck</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinaten</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -4671,37 +5608,43 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Direkter Abstieg zur ersten Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Plane backgas Pausen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gas Optionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deko AMV</translation>
     </message>
@@ -4716,27 +5659,33 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Deko pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Zeige runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Zeige Segmentdauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Aufstiege in der Deko anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>ausführlicher Tauchplan</translation>
     </message>
@@ -4762,17 +5711,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 0f1855989..81bd93846 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="el_GR" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Ακύρωση</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Τύπος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Αλλαγή στα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Πατώντας εδώ θα διαγραφή αυτή η φιάλη.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Η φιάλη δεν μπορεί να διαγραφεί</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Στολή</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Ζευγάρι</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Βαθμός</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Ορατότητα</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Ετικέτες</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Βάρη</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Φιάλες</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Μοντέλο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID Συσκευής</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -122,14 +695,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -261,13 +826,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation type="unfinished"/>
     </message>
@@ -277,11 +842,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation type="unfinished"/>
@@ -302,143 +862,148 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Γραμματοσειρά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Μέγεθος Γραμματοσειράς</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF αρχεία (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
@@ -628,42 +1193,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Είστε έτοιμοι να απορρίψετε το Πλάνο.</translation>
     </message>
@@ -671,17 +1236,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
@@ -762,67 +1327,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Βαθμός</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>καμία κατάδυση δεν έχει επιλεγεί</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>εσωτερικό σφάλμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Done</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Μεταφόρτωση λίστας καταδύσεων...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Λήψη λίστας καταδύσεων...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Λήψη %1 καταδύσων...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Η λήψη τελείωσε - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Κατεστραμμένη λήψη</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Η μεταφόρτωση απέτυχε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Η μεταφόρτωση πέτυχε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Login failed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Σφάλμα: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Η μεταφόρτωση τελείωσε</translation>
     </message>
@@ -948,32 +1543,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Επιλέξτε το αρχείο για το logfile της λήψης από τον υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Επιλέξτε αρχείο για το binary dump file του υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump files (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Save libdivecomputer dumpfile</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
@@ -1091,27 +1704,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
@@ -1258,84 +1871,78 @@
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>άγνωστο</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1343,82 +1950,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Εκτύπωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1427,454 +2049,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;New logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Νέο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Open logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Αποθήκευση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Αποθήκευση ως...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Έ&amp;ξοδος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>Εκτύ&amp;πωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>Έ&amp;ξοδος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Εισαγωγή από &amp;υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>Επ&amp;αναρίθμηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Αριστερά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Δεξιά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1882,380 +2500,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Προεπιλογές</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Μονάδες Μέτρησης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Γράφημα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Γλώσσα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Γραμματοσειρά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Μέγεθος Γραμματοσειράς</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Σύστημα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Μετρικό</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Προσαρμογή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>μέτρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>πόδια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>λίτρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Κωδικός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Φίλτρο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Πίεση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Όγκος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Μονάδες Μέτρησης Χρόνου</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Λεπτά (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Δευτερόλεπτα (sec)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Εμφάνιση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFlow στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Διάφορα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Προτιμήσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2280,32 +2910,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Απαιτείται επανεκκίνηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
@@ -2327,49 +2957,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Εκτύπωση</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Κατάδυση#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2432,72 +3062,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Κατάδυση #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Μέγιστο Βάθος: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Διάρκεια: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Βάρη:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Σημειώσεις:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Ζευγάρι:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Στολή:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Ορατότητα:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Βαθμός:</translation>
     </message>
@@ -2505,82 +3135,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Απόκρυψη παρόμοιων συμβάντων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Απόκρυψη όλων των συμβάντων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Απόκρυψη όλων των συμβάντων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Απόκρυψη όλων των %1 συμβάντων;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2593,7 +3223,7 @@ p, li { white-space: pre-wrap; }
         <translation>ΑΕΡΑΣ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2618,72 +3248,85 @@ p, li { white-space: pre-wrap; }
         <translation>Μέγιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Άκυρη απάντηση από τον σέρβερ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Malformed XML response. Line %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2843,47 +3486,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Σύνδεση...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Η λήψη τελείωσε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Σφάλμα λήψης: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Άκυρος έλεγχος χρήστη!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Cannot parse response!</translation>
     </message>
@@ -2899,17 +3542,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2945,22 +3588,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3042,76 +3695,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Αποστολή</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3119,12 +3777,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3172,12 +3830,12 @@ OS CPU Architecture: %1</source>
         <translation>Μεταφόρτωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Μεταφορά δεδομένων...</translation>
     </message>
@@ -3185,97 +3843,110 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Έτος
 &gt; Μήνας / Ταξίδι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Συνολική
 Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Μέσος Όρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Συντομότερο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Μακρύτερο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Μέσο
 Βάθος (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Ελάχιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Μέγιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>Μέσο
 SAC (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Μέση
@@ -3285,87 +3956,86 @@ SAC (%1)</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ή (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>αέρας</translation>
     </message>
@@ -3407,229 +4077,229 @@ SAC (%1)</translation>
         <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>κανένα</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>στάση αποσυμπίεσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>άνοδος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>ταβάνι</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>φόρτο εργασίας</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>πομπός</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>παράβαση</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>σελιδοδείκτης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>επιφάνεια</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>στάση ασφαλείας</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>αλλαγή αερίου</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>στάση ασφαλείας (προληπτική)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>στάση ασφαλείας (υποχρεωτική)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>βαθιά στάση</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>ταβάνι (στάση ασφαλείας)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>διάρκεια</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>προειδοποίηση επιπέδου ιστών</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>άκυρος αριθμός συμβάντος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Αδύνατον να αναλυθεί το %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Σφάλμα στην ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Κατάδυση %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Σφάλμα στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Σφάλμα στον αριθμό των αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Σφάλμα στο μίγμα αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Σφάλμα στα δείγματα</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Σφάλμα στην εισαγωγή δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation>
     </message>
@@ -3641,19 +4311,19 @@ SAC (%1)</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Σφάλμα στην ανάλυση του &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Σφάλμα στο ερώτημα get_events της βάσης δεδομένων
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3666,33 +4336,33 @@ SAC (%1)</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation>
     </message>
@@ -3702,451 +4372,451 @@ SAC (%1)</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Πάρα πολλά μείγματα αερίων</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dive)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>σκάφος</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>ακτή</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>ρεύμα</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>βαθιά</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>ανοικτό σπήλαιο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>πάγος</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>ναυάγιο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>σπήλαιο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>υψόμετρο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>πισίνα</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>λίμνη</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>ποτάμι</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>νύχτα</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>fresh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>μαθητής</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>φωτογραφία</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>βίντεο</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>εκπαιδευτής</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>αποσυμπίεση</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -4196,97 +4866,97 @@ EADD: %d%s
         <translation>(καμία κατάδυση)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Κυρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Δευ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Τρι</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Τετ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Πεμ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Παρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Σαβ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Ιαν</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Φεβ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Μαρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Απρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Μαι</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Ιουν</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Ιουλ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Αυγ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Σεπ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Οκτ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Νοε</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Δεκ</translation>
     </message>
@@ -4321,92 +4991,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Reading %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>δεδομένα</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>divelog entry id</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>divespot data id</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>more data dive id</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>υγρού τύπου</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>ημιστεγανή</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>στεγανή</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>μονοσόρτς</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>γιλέκο</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>μονοκόματη</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 κομματιών</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>μεμβράνης</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Init Communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis init failed</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Έναρξη λήψης</translation>
     </message>
@@ -4501,12 +5171,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Συναγερμός Χαμηλής Μπαταρίας</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Ώρα</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Βαθμός</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Ορατότητα</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Ζευγάρι</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Στολή</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Ετικέτες</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Συνολική Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Τύπος</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Μέγεθος</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Βάρος</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Συντεταγμένες</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation type="unfinished"/>
@@ -4628,37 +5565,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC Βυθού</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4673,27 +5616,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4719,17 +5668,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 22212b47c..470bccfb9 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -1,6 +1,513 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="en_GB" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <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="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation>Could not open backup file: %1</translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation>Setting successfully written to device</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation>Backup</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation>Serial No.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation>English</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation>German</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation>French</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation>Italian</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation>MMDDYY</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation>DDMMYY</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation>YYMMDD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation> m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation>Medium</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation>High</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation>2s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation>10s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation>Red</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation>Green</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation>Blue</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation>Sync dive computer time with PC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation>%O2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation>Gas 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation>Gas 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation>Gas 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation>Gas 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation>Gas 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation>Dil 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation>Dil 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation>Dil 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation>Dil 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation>Dil 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation>SP 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation>SP 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation>SP 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation>SP 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation>SP 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation>Dive computer details read successfully.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation>Backup files (*.xml)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <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="405"/>
+        <source>Backup succeeded</source>
+        <translation>Backup succeeded</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <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="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <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="431"/>
+        <source>Restore succeeded</source>
+        <translation>Restore succeeded</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <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="443"/>
+        <source>Select firmware file</source>
+        <translation>Select firmware file</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation>All files (*.*)</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +550,90 @@
         <translation>Switch at</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Clicking here will remove this cylinder.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cylinder cannot be removed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation>Component selection</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation>Which components would you like to copy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Location</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Suit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation>GPS coordinates</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Visibility</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Weights</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Cylinders</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +656,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Device ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Nickname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Clicking here will remove this dive computer.</translation>
     </message>
@@ -122,14 +697,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +704,87 @@
         <translation>Show search box</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Expand all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Collapse all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Collapse others</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remove dive(s) from trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Create new trip above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Merge trip with trip above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Merge trip with trip below</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Delete dive(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Mark dive(s) invalid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Merge selected dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Renumber dive(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Shift times</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Load images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Open image files</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +828,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Selected dives</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>All dives</translation>
     </message>
@@ -277,11 +844,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Export dive log files</translation>
@@ -302,143 +864,148 @@
         <translation>Subsurface numbers</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Export list only</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Style options</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Font size</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Theme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Light</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF files (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Comma separated values that include the most relevant information of the dive profile.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface native XML format.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Export UDDF file as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Export CSV file as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Export world map</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Export Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Export HTML files as</translation>
     </message>
@@ -628,42 +1195,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Final depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Used gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Discard the plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>You are about to discard your plan.</translation>
     </message>
@@ -671,17 +1238,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Dive planner points</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Available gases</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Add dive data point</translation>
     </message>
@@ -762,67 +1329,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Mins</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation>Weight(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation>Depth(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1427,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>no dives were selected</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>cannot create temporary file: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>internal error: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>internal error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Done</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Uploading dive list...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Downloading dive list...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Downloading %1 dives...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Download finished - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Corrupted download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Upload failed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Upload successful</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Login failed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Upload finished</translation>
     </message>
@@ -948,32 +1545,32 @@
         <translation>Find Uemis dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump files (*.bin)</translation>
     </message>
@@ -1037,6 +1634,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Save libdivecomputer dumpfile</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation>Download into new trip</translation>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <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="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Could not a establish connection to the dive computer.</translation>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1665,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
@@ -1091,27 +1706,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Dive notes</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Air temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Water temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -1258,67 +1873,61 @@
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Air temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Water temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>This trip is being edited.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Multiple dives are being edited.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>This dive is being edited.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Trip notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Trip location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>unknown</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Deepest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Shallowest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1936,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation> and </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Discard the changes?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>You are about to discard your changes.</translation>
     </message>
@@ -1345,82 +1954,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Toggle pHe graph</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Toggle calculating all tissues</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Toggle DC reported ceiling</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Toggle calculated ceiling</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Toggle NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Toggle calculated ceiling with 3m increments</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation>Re-plan &amp;dive</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Toggle heart rate</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Toggle MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Toggle EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Toggle SAC rate</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Toggle ruler</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Toggle viewing picture thumbnails</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Print</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2057,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;New logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>New</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Open logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Sa&amp;ve as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Save as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Close</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>P&amp;references</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Import &amp;GPS data from Subsurface web service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation>&amp;Copy dive components</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation>&amp;Paste dive components</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;All</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Next DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;About Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Import &amp;from divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Full screen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Toggle full screen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Check for updates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Export</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Export Dive Logs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Rescale depth axis</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Print</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Import from &amp;dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Toggle pO₂ Graph</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Toggle pN₂ Graph</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Edit device names</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Add dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Auto &amp;group</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Yearly statistics</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Dive list</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>P&amp;revious DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Left</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Right</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>User &amp;manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lan dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Import log files</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Import divelog files from other applications</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Open file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Print runtime table</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Yearly statistics</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Save changes?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Save file as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Open dive log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2508,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Last stop at 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft to surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m to surface</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Defaults</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Units</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Graph</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Network</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Font size</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Use default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animations</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Speed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Clear all settings</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Reset all settings to their default value</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metric</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalize</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>feet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>System default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Requires authentication</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Username</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Pressure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Lists and tables</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Default dive log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Display invalid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Default cylinder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Use default cylinder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface web service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Default user ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Save user ID locally?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Time units</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Seconds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Show</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow at max depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Preferences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Ascent/descent speed denominator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Threshold when showing pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Threshold when showing pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Threshold when showing pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Max pO₂ when showing MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Draw dive computer reported ceiling red</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Show unused cylinders in Equipment tab</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Show average depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2918,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Restart required</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Open default log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
@@ -2333,49 +2965,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Print</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface cannot find installed printers on this system!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Dive No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3070,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Dive No. %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Max depth: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Duration: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gas used:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Tags:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Weights:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Suit:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Viz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Rating:</translation>
     </message>
@@ -2511,82 +3143,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Make first dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Delete this dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Add gas change</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Add bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Remove event</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Hide similar events</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Edit name</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Unhide all events</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Hide events</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Hide all %1 events?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Remove the selected event?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Edit name of bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Custom name:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Name is too long!</translation>
     </message>
@@ -2599,7 +3231,7 @@ p, li { white-space: pre-wrap; }
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Remove this point</translation>
     </message>
@@ -2624,72 +3256,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Invalid response from server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Malformed XML response. Line %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <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="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Could not a establish connection to the dive computer.</translation>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3494,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Download finished</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Download error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Connection error: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Download successful</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Invalid user identifier!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Cannot parse response!</translation>
     </message>
@@ -2905,17 +3550,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3596,32 @@ p, li { white-space: pre-wrap; }
         <translation>Please check your internet connection.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <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="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3703,85 @@ p, li { white-space: pre-wrap; }
         <translation>The following information about your system will also be submitted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operating System: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU Architecture: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Language: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Should we ask you later?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <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="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Ask later</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Submit user survey.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Ask again?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Send</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Architecture: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>The following error occurred:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Please check your internet connection.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Survey successfully submitted.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3789,12 @@ OS CPU Architecture: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3842,12 @@ OS CPU Architecture: %1</translation>
         <translation>Upload</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Transfering data...</translation>
     </message>
@@ -3195,97 +3855,110 @@ OS CPU Architecture: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Clicking here will remove this weight system.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <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="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Could not a establish connection to the dive computer.</translation>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Year 
  &gt; Month / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Duration 
  Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Shortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Longest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Depth (%1)
  Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3295,87 +3968,86 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -3417,229 +4089,229 @@ Maximum</translation>
         <translation>Maximum number of supported columns on CSV import is %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>none</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>ascent</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>workload</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>transmitter</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>safety stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gas change</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (recommended)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (mandatory)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>deep stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (safety stop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>divetime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>maxdepth</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>tissue level warning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>no-stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>invalid event number</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Error registering data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Error parsing the date/time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Dive %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Error parsing the divetime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error parsing the maxdepth</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error parsing the gas mix count</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Error obtaining water salinity</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error obtaining surface pressure</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Error parsing the gas mix</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Error parsing the samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Error registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Dive data import error</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Unable to open %s %s (%s)</translation>
     </message>
@@ -3651,19 +4323,19 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Failed to parse &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Database query get_events failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Database query get_tags failed.
@@ -3677,36 +4349,36 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database query failed &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Database query get_cylinders failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Database query get_changes failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Database query get_profile_sample failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Can&apos;t open stylesheet %s</translation>
     </message>
@@ -3716,136 +4388,136 @@ Maximum</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Can&apos;t find gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Too many gas mixes</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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 IMPLEMENTION BASED ON IT, 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dive plan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>depth</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>duration</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Switch gas to %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gas consumption:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Warning:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3854,70 +4526,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3926,7 +4598,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3935,262 +4607,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Safety Stop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Safety Stop: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Calculated ceiling %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tissue %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>heartbeat: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>bearing: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dive)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>boat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>shore</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>deep</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>cavern</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>ice</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>wreck</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>cave</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>lake</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>river</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>night</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>fresh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>photo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instructor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4240,97 +4912,97 @@ EADD: %d%s
         <translation>(no dives)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Sun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Tue</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Wed</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Thu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Fri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sat</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -4365,92 +5037,92 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Reading %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>divelog entry id</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>divespot data id</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>more data dive id</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>drysuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 pcs full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Init Communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis init failed</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Start download</translation>
     </message>
@@ -4545,12 +5217,279 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Low Battery Alert</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Can&apos;t open file %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Time</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Location</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Visibility</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Suit</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Yearly statistics</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Total Time</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Size</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Weight</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coordinates</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Date:</translation>
@@ -4672,37 +5611,43 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Drop to first depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Plan backgas breaks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gas options</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Bottom SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
@@ -4717,27 +5662,33 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Dive notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Display runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Display segment duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Display transitions in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Verbatim diveplan</translation>
     </message>
@@ -4763,17 +5714,17 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>6m to surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 83751505e..8f3b6d2cb 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>…</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,23 +548,91 @@
         <translation>Cambio a </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Pulsar aquí borrará esta botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>La botella no puede borrarse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Ubicación</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Traje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Compañero</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Valoración</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Visibilidad</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Lastre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Botellas</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -82,22 +655,22 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID del dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Hacer clic aquí borrará este ordenador de buceo.</translation>
     </message>
@@ -123,14 +696,6 @@ el ordenador de buceo seleccionado?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -138,87 +703,87 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Mostrar casilla de busqueda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Contraer todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Contraer otras</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Borrar inmersión(es) del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Crear nuevo viaje por encima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Borrar inmersión(es)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <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="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Mezclar las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Desplazar horas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Cargar imágenes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Abrir archivos de imagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -262,13 +827,13 @@ el ordenador de buceo seleccionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Inmersiones seleccionadas</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Todas las inmersiones</translation>
     </message>
@@ -278,11 +843,6 @@ el ordenador de buceo seleccionado?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Javascript mínimo</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exportar archivos de diarios de buceo</translation>
@@ -303,143 +863,148 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Numeración de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Exportar solo la lista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Opciones de estilo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Tamaño de letra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Ligero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Arena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Archivos CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Valores separados por comas que incluyen la información más relevante del perfil de inmersión.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Exportar archivo UDDF como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Exportar archivo CSV como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Exportar Mapamundi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>Archivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar a XML de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Archivos XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exportar archivos HTML como</translation>
     </message>
@@ -629,42 +1194,42 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Profundidad final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Tiempo de ejecución</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gas usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>¿Descartar el plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Está a punto de descartar su plan.</translation>
     </message>
@@ -672,17 +1237,17 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Puntos del planificador de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Gases disponibles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Añadir punto de datos de inmersión.</translation>
     </message>
@@ -763,67 +1328,97 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Valoración</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Minutos</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>CNS máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -831,95 +1426,95 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>No se seleccionó ninguna inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>No puedo crear archivo temporal: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>Error interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>Error interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Hecho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Subiendo lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Descargando lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Descargando %1 inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Descarga finalizada - </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>La subida ha fallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Subida correcta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>El acceso ha fallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>No se puede leer la respuesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Subida finalizada</translation>
     </message>
@@ -949,32 +1544,32 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Encontrar ordenador de buceo Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Archivos Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Archivos de volcado (*.bin)</translation>
     </message>
@@ -1038,6 +1633,24 @@ el ordenador de buceo seleccionado?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Guardar volcado de libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1051,7 +1664,7 @@ el ordenador de buceo seleccionado?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
@@ -1092,27 +1705,27 @@ el ordenador de buceo seleccionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notas de la inmersión</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Temperatura del aire</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Temperatura del agua</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -1259,67 +1872,61 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. aire [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. agua [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Este viaje está siendo editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Se están editando varias inmersiones.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Esta inmersión esta siendo editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Notas del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Ubicación del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Inmersión más profunda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Inmersión más superficial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1328,17 +1935,17 @@ a partir de aire y usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>¿ Descartar los cambios ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Estás a punto de descartar tus cambios.</translation>
     </message>
@@ -1346,82 +1953,97 @@ a partir de aire y usando:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Activar el gráfico de pHe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Activar cálculo de todos los tejidos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Activar techo informado por el ordenador</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Activar techo calculado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Activar LND, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Activar techo calculado con incrementos de 3m</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Activar ritmo cardiaco</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Activar PMO</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Activar PEA, PNE y EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Activar tasa de CAS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Activar regla</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Activar la visión de miniaturas de fotografías</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detalles del plan de inmersión&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1434,454 +2056,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nuevo registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Abrir registr&amp;o</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>P&amp;referencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importar datos &amp;GPS del servicio web de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Información</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Siguie&amp;nte ordenador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importar desde Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Activar pantalla completa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Comprobar si hay actualizaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exportar diarios de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Cambiar de escala  el eje de profundidad</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>Im&amp;primir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar del or&amp;denador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>…</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Activar gráfico de pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Activar gráfico de pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Editar nombres de dispositivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Añadir inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Auto a&amp;grupar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Lista &amp;de Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Ante&amp;rior ordenador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>&amp;Manual de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lanificar inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importar archivos de registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importar archivos de registro de otras aplicaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabla de tiempo de ejecución</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Estadísticas anuales</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>¿Guardar cambios?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Guardar archivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Abrir archivo de registro de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Archivos de registro  (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Archivos XML (*.xml);;Archivos UDDF/UDCF (*.uddf *.udcf);;Archivos Jdivelog (*.jlb);;Archivos Suunto (*.sde *.db);;Archivos CSV (*.csv);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1889,380 +2507,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Última parada a 20pies</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <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="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>De 20 pies a superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>De 50% prof. media a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>De 6m a superficie</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Predeterminadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Gráfico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Lenguaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Tamaño de letra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Predeterminado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Velocidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Borrar todos los ajustes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Reiniciar todos los ajustes a sus valores por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>pie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>pie³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Predeterminado del sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Tipo de proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Requiere autenticación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Presión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listas y tablas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Archivo de registro por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Mostrar no validas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Botella por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Usar botella por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Servicio web de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>ID de usuario por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>¿Guardar localmente la ID de usuario?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Unidades de tiempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GF bajo a la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Denominador de la velocidad de ascenso/descenso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Umbral al mostrar la pO₂ </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Umbral al mostrar la pN₂ </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Umbral al mostrar la pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Max pO₂ al mostrar PMO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Trazar en rojo el techo informado por el ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Mostrar botellas no usadas en la pestaña Equipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Mostrar la profundidad media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GF alto</translation>
     </message>
@@ -2287,32 +2917,32 @@ p, li { white-space: pre-wrap; }
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Reinicio requerido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Abrir archivo de registro por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
@@ -2334,71 +2964,71 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Inmersión n.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Guía</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>&amp;6 dives per page</source>
-        <translation type="unfinished"/>
+        <translation>&amp;6 Inmersiones por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="57"/>
         <source>&amp;1 dive per page</source>
-        <translation type="unfinished"/>
+        <translation>&amp;1 Inmersión por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="70"/>
         <source>&amp;2 dives per page</source>
-        <translation type="unfinished"/>
+        <translation>&amp;2 Inmersiones por página</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="83"/>
         <source>&amp;Table print</source>
-        <translation type="unfinished"/>
+        <translation>Impresión de &amp;tabla</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="106"/>
@@ -2418,12 +3048,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/printoptions.ui" line="153"/>
         <source>Prof&amp;ile on top</source>
-        <translation type="unfinished"/>
+        <translation>Perf&amp;il arriba</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="169"/>
         <source>&amp;Notes on top</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Notas arriba</translation>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="29"/>
@@ -2439,72 +3069,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Inmersión n.º %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Profundidad máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Duración: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gas usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Etiquetas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Lastre:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Traje:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Visibilidad:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Calificación:</translation>
     </message>
@@ -2512,82 +3142,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <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="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Borrar este ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Añadir cambio de gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Añadir marca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Borrar evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Ocultar eventos similares</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Editar nombre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Revelar todos los eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>¿ Ocultar todos los eventos %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>¿ Borrar el evento seleccionado ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Editar el nombre de la marca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Nombre personalizado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>¡El nombre es demasiado largo!</translation>
     </message>
@@ -2600,7 +3230,7 @@ p, li { white-space: pre-wrap; }
         <translation>AIRE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Borrar este punto</translation>
     </message>
@@ -2625,72 +3255,85 @@ p, li { white-space: pre-wrap; }
         <translation>Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Respuesta del servidor inválida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Respuesta XML mal formada. Línea %1:%2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2850,47 +3493,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Servicio web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Conectando…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Descarga finalizada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Error de descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Error de conexión:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Descarga completa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>El identificador de usuario no es válido.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>No se puede analizar la respuesta.</translation>
     </message>
@@ -2906,17 +3549,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2952,22 +3595,32 @@ p, li { white-space: pre-wrap; }
         <translation>Por favor, comprueba la conexión a internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Estás usando la última versión de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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;Clica 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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Está disponible una nueva versión de Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3049,80 +3702,85 @@ p, li { white-space: pre-wrap; }
         <translation>También se remitirá la siguiente información sobre tu sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Sistema Operativo: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Arquitectura de la CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Idioma: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>¿ Te preguntamos más adelante ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>No me preguntes de nuevo </translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Pregúntame más adelante</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Enviar encuesta de Usuario.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>¿ Preguntar de nuevo ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Arquitectura del SO CPU : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Ocurrió el siguiente error:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Encuesta enviada correctamente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3130,12 +3788,12 @@ Arquitectura del SO CPU : %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3183,12 +3841,12 @@ Arquitectura del SO CPU : %1</translation>
         <translation>Subir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Tiempo de espera sobrepasado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Transfiriendo datos…</translation>
     </message>
@@ -3196,97 +3854,110 @@ Arquitectura del SO CPU : %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hacer clic aquí borrará este sistema de lastre</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Año
 &gt; Mes / Viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Duración
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Más larga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidad (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>CAS (%1)
 Medio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3296,87 +3967,86 @@ Media</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>pie³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>aire</translation>
     </message>
@@ -3418,229 +4088,229 @@ Media</translation>
         <translation>El máximo número de columnas que soporta importar CSV es %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>ninguno</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>parada deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>ascenso</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>techo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>carga</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>transmisor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>violación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>parada de seguridad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>cambio de mezcla</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de seguridad (voluntaria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de seguridad (obligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>parada de profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>techo (parada de seguridad)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>duración de inmersión</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>por debajo del techo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Profundidad Max</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>tiempo de aire</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>encabezado</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Alarma de nivel de tejidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>tiempo sin parada</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>el número de evento no es válido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Error al registrar los datos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Error al analizar la fecha</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Inmersión n.º %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Error al analizar el tiempo de buceo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error al analizar la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Error al obtener salinidad del agua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error al obtener la presión en superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Error al analizar la mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Error al analizar las muestras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: esperando acción del usuario</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Error al registrar el manejador de eventos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Error al importar datos de inmersiones</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>No se pudo abrir  %s %s (%s)</translation>
     </message>
@@ -3652,19 +4322,19 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>No se pudo analizar «%s»</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Falló la petición get_events a la base de datos.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Consulta de la base de datos get_tags falló.
@@ -3678,36 +4348,36 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Consulta de la base de datos get_cylinders falló.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Consulta de la base de datos get_changes falló.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Consulta de la base de datos get_profile_sample falló.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>No se puede abrir la hoja de estilo %s</translation>
     </message>
@@ -3717,136 +4387,136 @@ Media</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>No puedo encontrar el gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas mezclas de gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
-        <translation type="unfinished"/>
+        <translation>Cálculo de descompresión abortado por exceso de tiempo</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Plan de buceo de Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>Tiempo de ejecución</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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 de ejecución %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="606"/>
+        <location filename="../planner.c" line="595"/>
         <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 de ejecución %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Cambiar gas a %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gas:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3855,70 +4525,70 @@ Prof: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>Pres: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>CAS: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>PMO: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3927,7 +4597,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3936,261 +4606,261 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de seguridad: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de seguridad: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Parada deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Parada deco: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>En deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Parada deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>En deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Techo calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tejido %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>Ritmo cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>Soporte: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sProf:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sProf:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sPres:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 inmersiones)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 inmersión)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>barco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>orilla</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>a la deriva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>profunda</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>hielo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>pecio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>cueva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>altura</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>río</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>noche</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>agua dulce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>estudiante</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>vídeo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instructor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4240,97 +4910,97 @@ EADD: %d%s
         <translation>(ninguna inmersión)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Ju</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Vi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mayo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -4365,92 +5035,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Leyendo %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>datos</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>identificador de entrada del diario</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>identificador del punto de buceo</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>más datos para el identificador de  inmersión</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>traje húmedo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semiseco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>traje seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>chaleco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>chaleco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>traje completo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>traje completo 2 piezas</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Iniciar comunicación</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Fallo al intentar iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Iniciar la descarga</translation>
     </message>
@@ -4545,12 +5215,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Alerta de batería baja</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>No se puede abrir el archivo %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Hora</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Ubicación</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Temperatura del aire</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Temp. del agua</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Estadísticas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Valoración</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Visibilidad</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Compañero</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Traje</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Estadísticas anuales</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Año</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Tiempo total</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Profundidad mínima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Profundidad max</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min Temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Temp. máx.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Tamaño</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Fecha:</translation>
@@ -4672,37 +5609,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Caer a la primera profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Planear &quot;breaks&quot; con gas de fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Opciones de gases</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>CAS en fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>CAS en deco</translation>
     </message>
@@ -4717,27 +5660,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>pO₂ en deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notas de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Mostrar tiempo de ejecución</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Mostrar duración de los segmentos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Mostrar transiciones en deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Plan de inmersión extendido</translation>
     </message>
@@ -4763,17 +5712,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>De 6m a superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>En planificación, mostrar tiempo de ejecución de paradas (tiempo absoluto)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 1058c305d..1d86e0b18 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Loobu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tüüp</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Vaheta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Siin klikkamine eemaldab selle ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Ballooni ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Ülikond</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Semu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Hinne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Nähtavus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Märkmed</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Märgendid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Raskused</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Balloonid</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Mudel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Seadme ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Hüüdnimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Siin klikates eemaldate selle sukeldumiskompuutri.</translation>
     </message>
@@ -122,14 +695,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@
         <translation>Näita otsingukasti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Laienda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Ahenda kõik kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Ahenda teised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Loo uus väljasõit üles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Kustuta sukeldumine/sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Ühenda valitud sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Nummerda sukeldumine/sukeldumised ümber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Nihuta ajad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Lae pildid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Ava pildifailid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Valitud sukeldumised</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Kõik sukeldumised</translation>
     </message>
@@ -277,11 +842,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimaalne Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Ekspordi sukeldumise logifailid</translation>
@@ -302,143 +862,148 @@
         <translation>Subsurface numbrid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Ekspordi ainult nimekiri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Stiili valikud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Fondi suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Teema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Valgus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Liiv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF failid (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV failid (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Eraldajaga (koma, tab, vms) eraldatud väärtused mis sisaldavad kõige olulisemat sukeldumise profiili infot.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface oma XML vorming</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Ekspordi UDDF fail kui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Ekspordi CSV fail kui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Ekspordi maailmakaart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML failid (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Ekspordi Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML failid (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Ekspordi HTML fail kui</translation>
     </message>
@@ -628,42 +1193,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Lõppsügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Töö aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Kasutatud gaas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC seadepunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Loobu plaanist?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Oled plaanist loobumas.</translation>
     </message>
@@ -671,17 +1236,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Sukeldumise planeerija punktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Saadaval gaasid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Lisa sukeldumise andmepunkt</translation>
     </message>
@@ -762,67 +1327,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Hinne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Minutid</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Ball</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>nael</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>nael</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
@@ -830,95 +1425,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>Ühtegi sukeldumist pole valitud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>ei suuda luua ajutist faili: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>sisemine viga: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>sisemine viga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Sukeldumiste listi üleslaadimine...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Sukeldumiste listi allalaadimine...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Laen alla %1 sukeldumist...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Allalaadimine lõppenud - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Vigane allalaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Üleslaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Üleslaadimine edukas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Sisselogimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Üleslaadimine lõppenud</translation>
     </message>
@@ -948,32 +1543,32 @@
         <translation>Leia Uemis sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vali sukeldumiskompuutri allalaadimise logifail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Logifailid (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Tõmmisefailid (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Salvesta libdivecomputer tõmmisefail</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
@@ -1091,27 +1704,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Sukeldumise märkmed</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Õhu temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Vee temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
@@ -1258,67 +1871,61 @@
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Õhu temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Vee temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Seda väljasõitu toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mitut sukeldumist toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Seda sukeldumist toimetatakse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Väljasõidu märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Väljasõidu koht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>tundmatu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Sügavaim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Madalaim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1326,17 +1933,17 @@ mixed from Air and using:
 õhust ja kasutades:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Loobu muudatustest?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Oled muudatustest loobumas.</translation>
     </message>
@@ -1344,82 +1951,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>pHe graaf</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Kõik koed</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Sukeldumiskompuutri poolt antud lagi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Arvutatud lagi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Arvutatud lagi 3m intervalliga</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Südame pulss</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>SAC määr</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Joonlaud</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Vaheta pildid pisipiltideks</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sukeldumise plaani detailid&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Väljastus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1432,454 +2054,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Logi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Vaade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Abi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Uus logiraamat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Uus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Ava logiraamat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Ava</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Sa&amp;lvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Impordi &amp;GPS andmed Subsurface veebiteenusest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profiil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Järgmine sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Subsurface kohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Maakera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Import divelogs.de-st</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Täisekraan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Kuva täisekraan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Kontrolli uuendusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksport</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Ekspordi sukeldumise logid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Skaleeri sügavuse telg</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Väljastus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Välju</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Impordi &amp;sukeldumiskompuutrist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Nummerda ümber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>pO₂ graaf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>pN₂ graaf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Toimeta sukeldumiskompuutrite hüüdnimesid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Lisa sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Automaatne grupeerimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Aastane statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Sukeldumiste nimekiri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>CTRL+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>CTRL+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>&amp;Eelmine sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Vasak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Parem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Kasutaja &amp;juhend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;laneeri sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Impordi logifailid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Impordi sukeldumislogi failid teistest rakendustest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Ava fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Väljasta jooksva aja tabel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Aastane statistika</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Salvesta muudatused?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Ava sukeldumislogi fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>sukeldumise logifailid (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML failid (*.xml);;UDDF/UDCF failid (*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto failid (*.sde *.db);;CSV failid (*.csv);;Kõik failid (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
     </message>
@@ -1887,381 +2505,393 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>jalg/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Viimane peatus 20 jala peal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% keskmine sügavus 20 jalani</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20 jalga pinnani</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Viimane peatus 6m peal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% keskmine sügavus 6m-i</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m pinnani</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Vaike-
 väärtused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Ühikud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Graaf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Keel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Võrk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Fondi suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Kasuta vaikeväärtust</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animatsioonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Kiirus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Kustuta kõik seaded</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Vii kõik seaded väikeväärtustele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>SI</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Isikupärasta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>meeter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>liiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Süsteemi vaikeväärtus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Peaarvuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Nõuab autentimist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Kasutajanimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Salasõna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Rõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Nimekirjad ja tabelid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Vaikimis sukeldumise logi fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Kuva ebaõnnestunud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Vaikimisi balloon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Kasuta vaikimis ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface veebiteenus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Vaikimisi kasutaja ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Salvesta kasutaja ID lokaalselt?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Maht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Ajaühikud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekundid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Näita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFlow max sügavusel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Muu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Tõusu/laskumise kiiruse nimetaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Lävi pO₂ kuvamisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Lävi pN₂ kuvamisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Lävi pHe kuvamisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Max pO₂ MOD kuvamisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Joonista sukeldumiskompuutri väljastatud lagi punasega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Näita kasutamata balloonid varustuse saki all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Näita keskmine sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ väärtused</translation>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Nõutav taaskäivitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Ava vaikimisi logifail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
@@ -2333,49 +2963,49 @@ väärtused</translation>
         <source>Print</source>
         <translation>Väljastus</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface ei suuda leida süsteemi printereid!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Sukeldumise nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ väärtused</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukeldumine #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Max sügavus: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Kestus: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Kasutatud gaas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Märgendid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Raskused:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Ülikond:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Nähtavus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Hinne:</translation>
     </message>
@@ -2511,82 +3141,82 @@ väärtused</translation>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 %2st)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Loo esimene sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Kustuta see sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Lisa gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Lisa järjehoidja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Eemalda sündmus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Peida sarnased sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Toimeta nimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Peida kõik sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Peida sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Peida kõik %1 sündmust?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Eemalda valitud sündmus?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Toimeta järjehoidja nimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Kohandatud nimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Nimi on liiga pikk!</translation>
     </message>
@@ -2599,7 +3229,7 @@ väärtused</translation>
         <translation>ÕHK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Eemalda punkt</translation>
     </message>
@@ -2624,72 +3254,85 @@ väärtused</translation>
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Vigane vastus serverilt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Vigane XML vastus. Rida %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ väärtused</translation>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Veebiteenus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Ühendab...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Allalaadimine lõppenud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Allalaadimise viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Ühenduse viga:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Allalaadimine õnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Vale kasutaja ID!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
@@ -2905,17 +3548,17 @@ väärtused</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3594,32 @@ väärtused</translation>
         <translation>Palun kontrolli oma netiühendust.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Kasutad Subsurface kõige uuemat versiooni.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Subsurface uus versioon on ilmunud.&lt;br/&gt;Kliki:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; selle allalaadimiseks.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Subsurface uus versioon on ilmunud.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3701,85 @@ väärtused</translation>
         <translation>Järgnev info sinu kasutatava süsteemi kohta saadetakse samuti meile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operatsioonisüsteem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU arhidektuur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Keel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <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="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Ära küsi minult uuesti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Küsi hiljem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Saada kasutusuuring.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Küsi uuesti?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Saada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arhidektuur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Tekkis järgmine viga:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Palun kontrolli oma netiühendust.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Kasutusuuring edastatad.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3787,12 @@ OS CPU Arhidektuur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3840,12 @@ OS CPU Arhidektuur: %1</translation>
         <translation>Üleslaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Toiming aegus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Andmete ülekanne...</translation>
     </message>
@@ -3195,97 +3853,110 @@ OS CPU Arhidektuur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Siin klikkides eemaldatakse raskuste süsteem.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Aasta
  &gt; Kuu / väljasõit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Kestus
 kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Lühim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Pikim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Sügavus (%1)
 keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3295,87 +3966,86 @@ Max</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>paskal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>jalg/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>jalga/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) või (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
@@ -3417,229 +4087,229 @@ Max</translation>
         <translation>CSV impordil on max toetatud veergude arv %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>mitte ükski</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>dekopeatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>tõus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>lagi</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>töökoormus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>saatja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>rikkumine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>järjehoidja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>pind</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>ohutuspeatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>ohutuspeatus (vabatahtlik)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>ohutuspeatus (kohustuslik)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>sügavpeatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>lagi (ohutuspeatus)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>põhjaaeg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>allpool taset</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>max sügavus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>Hapnikulimiidi osa (OLF)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>aeg õhuga</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>suund</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>koe taseme hoiatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>mittepeatuste aeg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>vale sündmuse nr</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Viga andmete registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Sukeldumine %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Viga põhjaaja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Viga max sügavuse tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Viga pinnarõhu saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Sündmus: ootan kasutaja sekkumist</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Ei saa avada %s %s (%s)</translation>
     </message>
@@ -3651,19 +4321,19 @@ Max</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>&apos;%s&apos; tuvastamine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Andmebaasi päring get_events ebaõnnestus.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Andmebaasi päring get_tags ebaõnnestus.
@@ -3677,36 +4347,36 @@ Max</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Andmebaasi päring ebaõnnestus &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Andmebaasi päring get_cylinders ebaõnnestus.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Andmebaasi päring get_changes ebaõnnestus.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Andmebaasi päring get-profile_sample ebaõnnestus.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Ei suuda avada stiililehte &amp;s</translation>
     </message>
@@ -3716,136 +4386,136 @@ Max</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Ei leia gaasi %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Liiga palju gaasisegusid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>TÄHELEPANU: SIIN ON KASUTUSEL BÜHLMANNI ALGORITMIL PÕHINEV SUKELDUMISTE PLANEERIJA, MIS ON NULLIST IMPLEMENTEERITUD JA SEDA ON HETKEL NAPILT KATSETATUD. SOOVITAME TUNGIVALT, MITTE PLANEERIDA OMA SUKELDUMIST AINULT SIIT SAADUD ANDMETE PÕHJAL.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface sukeldumise plaan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>sügavus</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>jooksev aeg</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>kestus</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gaas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Vaheta gaasiks %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gaasi tarbimine:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Hoiatus:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3854,70 +4524,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3926,7 +4596,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3935,257 +4605,257 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ohutuspeatus: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ohutuspeatus: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>Dekos
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Dekos (arvutatud)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Arvutatud lagi %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Kude %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>Pulss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>Kurss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 sukeldumist)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 sukeldumine)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>paat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>kallas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>hoovus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>sügav</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>õõs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>jää</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>vrakk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>koobas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>kõrgus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>bassein</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>järv</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>jõgi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>öö</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>magevesi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>õpilane</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4235,97 +4905,97 @@ EADD: %d%s
         <translation>(pole sukeldumisi)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Pühap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Esmasp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Teisip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Kolmap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Neljap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Reede</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Laup</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jaan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Veebr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Märts</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Juuni</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Juuli</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dets</translation>
     </message>
@@ -4359,92 +5029,92 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Loen %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>andmed</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>logi kirje ID</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>sukeldumiskoha andmete ID</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>rohkem sukeldumisandmete ID</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>märgülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>poolkuiv</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>kuivülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>lühike ülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>pikk john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>täisülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2-osaline täisülikond</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membraan</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Algata ülekanne</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis alglaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Alusta allalaadimist</translation>
     </message>
@@ -4539,12 +5209,279 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>Patarei tühjenemise häire</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Ei saa avada faili %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Aeg</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Õhutemp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Vee temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistika</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Hinne</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Nähtavus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Semu</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Ülikond</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Märgendid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Märkmed</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Aastane statistika</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Aasta</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Aeg kokku</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min sügavus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max sügavus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tüüp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Suurus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Raskus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinaadid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Kuupäev:</translation>
@@ -4666,37 +5603,43 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>GF madal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF kõrge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Lasku esimesele sügavusele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Viimane peatus 6m peal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>planeeri põhigaasi pausid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gaasi valikud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC põhjas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
@@ -4711,27 +5654,33 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Sukeldumise märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Kuva jooksev aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Kuva segmendi kestust</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Kuva üleminekud dekos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Detailne sukeldumisplaan</translation>
     </message>
@@ -4757,17 +5706,17 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>6m pinnani</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 a3eb8c407..0abb765d0 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tyyppi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Vaihda syvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Poista säiliö.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Säiliötä ei voida poistaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Sukellusvanhin</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Sukelluspari</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Painot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Säiliöt</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Malli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Laite ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Lempinimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Poista sukellustietokone.</translation>
     </message>
@@ -122,14 +695,6 @@ poistaa valitun sukellustietokoneen?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Näytä hakukenttä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Laajenna kaikki retket</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Supista kaikki retket</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Tiivistä muut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Erota sukellukset retkestä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Liitä uuteen retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lisää sukellukset alapuoliseen retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Liitä retki yllä olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Liitä retki alla olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Poista sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Merkitse sukellukset epäkelvoiksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Uhdistä valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Numeroi uudelleen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Muuta aikoja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Lataa kuvat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Avaa kuvatiedostot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ poistaa valitun sukellustietokoneen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Valitut sukellukset</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Kaikki sukellukset</translation>
     </message>
@@ -277,11 +842,6 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimaalinen Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Sukelluslokien vienti</translation>
@@ -302,143 +862,148 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Subsurfacen numerointi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Vie listamuodossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Tyyliasetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Fontti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Fontin koko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Teema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Vaalea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Hiekka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV tiedostot (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Arvot erotetaan pilkulla, jolloin tärkeimmät sukellusprofiilin tiedot voidaan ladata toiseen sovellukseen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurfacen oma XML -tiedostomuoto.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Vienti UDDF -tiedostoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Vienti CSV -tiedostoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Vie maailmankartta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML -tiedostot (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Vie Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML -tiedostot (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Vie HTML -tiedostoihin</translation>
     </message>
@@ -628,42 +1193,42 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Lopullinen syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Käytetty kaasuseos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CCR-asetuspiste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Hylätäänkö suunnitelma?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Olet hylkäämässä suunnitelmasi.</translation>
     </message>
@@ -671,17 +1236,17 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Sukellussuunnitelman etappipisteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Mahdolliset kaasut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Lisää sukellusetappi</translation>
     </message>
@@ -762,67 +1327,97 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Minuuttia</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>pauna</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>Pintakulutus</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>pauna</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>sukelluksia ei ole valittu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>väliaikaistiedoston luominen ei onnistu: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>sisäinen virhe: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>sisäinen virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Lähetetään sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Ladataan sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Ladataan %1 sukellusta...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Lataus päättynyt - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Lataus on korruptoitunut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Lähetys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Lähetys onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Kirjautuminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Virhe: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Lähetys valmistui</translation>
     </message>
@@ -948,32 +1543,32 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Etsi Uemis -sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Lokitiedostot (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Raakatiedostot (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ poistaa valitun sukellustietokoneen?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Tallenna sukellustietokoneen raakatiedosto</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ poistaa valitun sukellustietokoneen?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
@@ -1091,27 +1704,27 @@ poistaa valitun sukellustietokoneen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Ilman lämpötila</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Veden lämpötila</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
@@ -1258,67 +1871,61 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Ilman lämpötila [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Veden lämpötila [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Tätä sukellusretkeä muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Muokataan useita sukelluksia.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Tätä sukellusta muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Matkakohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>tuntematon</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Syvin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Matalin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ sekoittaa ilmasta ja käyttäen:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Hylätäänkö muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Olet hylkäämässä muutoksesi.</translation>
     </message>
@@ -1345,82 +1952,97 @@ sekoittaa ilmasta ja käyttäen:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Näytä/piilota pHe-kuvaaja</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Näytä/piilota kaikkien kudosten laskenta</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Näytä/piilota sukellustietokoneen raportoima kattosyvyys</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Näytä/piilota laskettu kattosyvyys</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Näytä/piilota NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Näytä/piilota laskettu kattosyvyys 3m:n tarkkuudella</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Näytä/piilota syke</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Näytä/piilota MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Näytä/piilota EAD, END sekä EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Näytä/piilota hengitysnopeus</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Näytä/piilota viivain</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Näytä/piilota kuvat profiilissa</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sukellussuunnitelman yksityiskohdat&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>Loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>Näkymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>Apua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>Liitä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>Uusi loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Avaa loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Avaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Tallenna nimellä...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>Profiilikuvaaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Seuraava tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Maapallo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Tuo Divelogs.de -sivustolta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Kokoruututila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Käytä kokoruututilaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Tarkista päivitykset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>Vienti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Sukelluslokin vienti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Skaalaa syvyysakseli</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Hae sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>Uudellennumeroi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Näytä/piilota pO₂ -kaavio</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Näytä/piilota pN₂ -kuvaaja</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Muokkaa laitenimiä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Lisää sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Ryhmittele automaattisesti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Sukelluslista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Edellinen tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Vasen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Oikea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Sukelluksen suunnittelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Liitä lokitiedostoja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Liitä lokitiedostoja toisesta sovelluksesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Tulosta sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Vuositilastot</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Tallenna muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Avaa sukellusloki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Sukelluslokitiedostot (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Viimeinen pysähdys 20 jalassa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% keskisyvyydestä - 20 jalkaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20 jalasta pintaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% keskisyvyydestä - 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m:stä pintaan</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Oletukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Yksiköt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Kaavio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Kieli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Fontti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Fontin koko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Käytä oletusta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animaatiot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Nopeus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Tyhjennä kaikki asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Palauta kaikki asetukset oletusarvoihin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Mukauta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>jalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>kuutiojalka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Järjestelmän oletus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Välityspalvelin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Välityspalvelimen tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Osoite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Portti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Vaatii kirjautumisen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Käyttäjätunnus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listat ja taulukot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Oletus lokitiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Näytä epäkelvot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Oletussäiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Käytä oletussäiliötä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurfacen verkkopalvelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Oletuskäyttäjätunnus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Tallennetaanko käyttäjätunnus paikallisesti?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Aikayksiköt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minuuttia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekuntia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow maksimisyvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Sekalaiset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Nousu-/laskunopeuden yksikkö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Kynnysarvo pO₂:lle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Kynnysarvo pN₂:lle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Kynnysarvo pHe:lle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Maksimi pO₂, kun näytetään MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>näytä keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
     </message>
@@ -2286,33 +2916,33 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Vaaditaan uudelleenkäynnistys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Avaa oletustiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
@@ -2334,49 +2964,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Asennettuja tulostimia ei löydy!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2439,72 +3069,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukellus #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Suurin syvyys: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Kesto: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Kaasun kulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Avainsanat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Painot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Sukellusvanhin:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Yleisarvio:</translation>
     </message>
@@ -2512,82 +3142,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 / %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Aseta ensisijaiseksi sukellustietokoneeksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Poista tämä sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Lisää kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Lisää kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Poista tapahtuma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Piilota samankaltaiset tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Muokkaa nimeä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Näytä kaikki tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Piilota tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Piilota kaikki %1 tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Poistetaanko valitut tapahtumat?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Muokkaa kirjanmerkin nimeä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Valinnainen nimi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Nimi on liian pitkä!</translation>
     </message>
@@ -2600,7 +3230,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Poista tämä etappi</translation>
     </message>
@@ -2625,72 +3255,85 @@ p, li { white-space: pre-wrap; }
         <translation>Korkein</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Virheellinen vastaus palvelimelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Virheellinen XML vastasu. Rivi %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2850,47 +3493,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Verkkopalvelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Yhdistetään...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Lataus valmistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Virhe latauksessa: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Yhteysvirhe:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Lataus onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Tuntematon käyttäjä!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
@@ -2906,17 +3549,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2952,22 +3595,32 @@ p, li { white-space: pre-wrap; }
         <translation>Tarkista Internetyhteys.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <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="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Saatavilla on uusi versio Subsurfacesta.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3049,79 +3702,84 @@ p, li { white-space: pre-wrap; }
         <translation>Järjestelmästäsi lähetetään myös seuraavat tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Käyttöjärjestelmä: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU arkkitehtuuri: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Kieli: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Voimmeko esittää kyselyn myöhemmin?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Älkää kysykö uudestaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Kysy myöhemmin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Lähetä käyttäjäkysely.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Kysytäänkö uudestaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Lähetä</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <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="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Tapahtui seuraava virhe:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Tarkista Internet -yhteytesi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Kysely on lähetetty onnistuneesti.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3787,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3840,12 @@ OS CPU Architecture: %1</source>
         <translation>Lähetä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Toimenpide ei valmistunut ajoissa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Tietoa siirretään...</translation>
     </message>
@@ -3195,97 +3853,110 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Poista painojärjestelmä.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Vuosi
 &gt; Kuukausi / Retki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Kesto
 Kokonais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Lyhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Pisin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dyvyys (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Alin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Suurin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Lämpö (%1)
@@ -3295,87 +3966,86 @@ Keski</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) tai (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>ilma</translation>
     </message>
@@ -3417,229 +4087,229 @@ Keski</translation>
         <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>ei mitään</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>deko-pysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>pohja-aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>nousu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>katto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>työmäärä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>lähetin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>rike</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>pinta</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>turvapysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>Kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>turvapysähdys (vapaaehtoinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>turvapysähdys (pakollinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>syväpysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>katto (turvapysähdys)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>liian syvällä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>Ilma-aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>suunta</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>kudoskertymän varoitus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>keskeytyksetön aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>tuntematon tapahtumanumero</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Sukellus %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
@@ -3651,19 +4321,19 @@ Keski</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Tietokantakysely &apos;get_events&apos; (nouda tapahtumat) epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Tietokantakysely &apos;get_tags&apos; epäonnistui.
@@ -3677,36 +4347,36 @@ Keski</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Tietokantakysely epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Tietokantakysely &apos;get_cylinders&apos; epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Tietokantakysely &apos;get_changes&apos; epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Tietokantakysely &apos;get_profile_sample&apos; epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Tyylitiedoston %1 avaus ei onnistu</translation>
     </message>
@@ -3716,138 +4386,138 @@ Keski</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Seosta %s ei löydy</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Liian monta kaasuseosta</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurfacen sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>syvyys</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>kesto</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>kaasu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3d min</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Vaihda kaasu seuraavaan: %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>Happikertymä (CNS)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Kaasun kulutus:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Varoitus:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3856,70 +4526,70 @@ S: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>N: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3928,7 +4598,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3937,261 +4607,261 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Turvapysähdys: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Turvapysähdys: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>Dekossa</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Dekossa (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Laskettu katto %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Kudos %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>syke: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>suunta: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sA: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sS:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sS:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1kuu %2 (%3 sukellusta)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1kuu %2 (1 sukellus)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>vene</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>ranta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>virta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>syvä</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>luola (cavern)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>jää</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>hylky</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>luola</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>korkeus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>uima-allas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>järvi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>joki</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>yö</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>makea</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>oppilas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>valokuva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>kouluttaja</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4241,97 +4911,97 @@ EADD: %d%s
         <translation>(ei sukelluksia)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>su</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>ti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>ke</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>to</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>pe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>la</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>tammi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>helmi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>maalis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>huhti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>touko</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>kesä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>heinä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>elo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>syys</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>loka</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>marras</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>joulu</translation>
     </message>
@@ -4366,92 +5036,92 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Luetaan sukellusta %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>tieto</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>id: sukelluslokimerkintä</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>id: lisää sijaintitietoa</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>id: lisää sukellusdataa</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>märkäpuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>puolikuiva</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>kuivapuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>lyhyt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>liivi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>haalari</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>takki</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>kokopuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>Kaksiosainen kokopuku</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>laminaatti</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Muodosta yhteys</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemiksen lukeminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Aloita lataus</translation>
     </message>
@@ -4546,12 +5216,279 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Hälytys: heikko paristo</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Tiedoston avaus ei onnistu %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Ajankohta</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Kello</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Ilman lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Veden lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Tilastot</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Sukelluspari</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Vuositilastot</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Vuosi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Kokonaiskesto</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Pienin syvyys</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Suurin syvyys</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Pienin pintakulutus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Suurin pintakulutus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Alin lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Ylin lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tyyppi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Tilavuus</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Painot</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinaatit</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Päivä:</translation>
@@ -4673,37 +5610,43 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>GF matala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF korkea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Putoaminen alkusyvyyteen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Suunnittele ilmatauot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Kaasuasetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Ilmankulutus pohjalla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Ilmankulutus (deko)</translation>
     </message>
@@ -4718,27 +5661,33 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>pO₂ dekossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Näytä sukellusaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Näytä etappien kestot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Näytä siirtymät dekossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Tarkka sukellussuunnitelma</translation>
     </message>
@@ -4764,17 +5713,17 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>6m:stä pintaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 87fa452d0..299d67bc1 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Changement à</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliquer ici retirera ce bloc.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Le bloc ne peut être retiré.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Ce mélange est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Lieu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Combinaison</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Chef de palanquée</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Binôme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Évaluation</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Visibilité</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Étiquettes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Poids</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Blocs</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modèle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Identifiant du périphérique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Cliquer ici enlèvera cet ordinateur</translation>
     </message>
@@ -122,14 +695,6 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>Afficher la fenêtre de recherche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Tout déplier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Tout replier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Replier les autres</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Créer un nouveau groupe au-dessus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Fusionner le groupe avec le groupe au dessus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Fusionner le groupe avec le groupe en dessous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Effacer la (les) plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Invalider la (les) plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Fusionner les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Renuméroter les plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Heure de changement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Charger les images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Ouvrir les fichiers images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Fichier image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Plongées sélectionnées</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Toutes les plongées</translation>
     </message>
@@ -277,11 +842,6 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Version minimum de Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exporter les fichiers de plongées</translation>
@@ -302,143 +862,148 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>Nombres Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Export de liste uniquement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Options de style</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Thème</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Clair</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sable</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Fichiers CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Valeurs séparées par des virgules, qui incluent les informations les plus pertinentes du profile de plongée </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Export HTML des lieux de plongées, indiqués sur la carte du monde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML natif Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Exporter le fichier UDDF en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Exporter le fichier CSV en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Exporter la carte mondiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>Fichiers HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exporter vers fichier XML Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Fichiers XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exporter le fichier HTML comme</translation>
     </message>
@@ -628,42 +1193,42 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Profondeur finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Temps de fonctionnement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gaz utilisé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC (recycleur) Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Abandonner le plan ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Vous allez annuler la planification.</translation>
     </message>
@@ -671,17 +1236,17 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Points du plannificateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Gaz disponibles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Ajouter un point de donnée</translation>
     </message>
@@ -762,67 +1327,97 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Évaluation</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Mins</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Blk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>SNC max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>livre US</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>Consommation d&apos;air</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>livre US</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>Aucune plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Erreur de création du fichier zip pour téléchargement: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>Erreur interne: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>Erreur interne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Téléchargement de la liste des plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <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="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 plongées en cours de téléchargement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Téléchargement terminé - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Téléchargement corrompu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Echec du téléchargement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Téléchargement terminé avec succès</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Echec de connexion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Impossible d&apos;analyser la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Erreur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Téléchargement terminé</translation>
     </message>
@@ -948,32 +1543,32 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>Chercher l&apos;ordinateur de plongée Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Choisir le fichier pour le téléchargement du fichier log de l&apos;ordinateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Fichier de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Sauvegarder le déchargement 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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Choisir le fichier pour le fichier de déchargement de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Fichiers de décharge (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Sauvegarder le fichier de décharge de libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
@@ -1091,27 +1704,27 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notes de plongée</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Température de l&apos;air</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Température de l&apos;eau</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -1258,67 +1871,61 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Température de l&apos;air. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Température de l&apos;eau. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Ce voyage est en train d&apos;être édité.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Plusieurs plongées sont en train d&apos;être éditées.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Cette plongée est en train d&apos;être éditée.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Info sur le voyage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Lieu du voyage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>inconnu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Plongée la plus profonde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Plongée la moins profonde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ mélangés à partir de l&apos;air avec:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>et</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Abandonner les modifications ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Vous perdrez les modifications non enregistrées.</translation>
     </message>
@@ -1345,82 +1952,97 @@ mélangés à partir de l&apos;air avec:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Basculer l&apos;affichage du graphique pHe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>activer la calcul de tout les compartiments</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Afficher le plafond de l&apos;ordinateur</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Afficher le plafond calculé</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Afficher LND / DTR</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Afficher le plafond calculé avec un incrémente de 3m</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Afficher le rythme cardiaque</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Afficher la MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Afficher PEA, PEEA, PEDA</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Afficher la consommation d&apos;air</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>afficher la règle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Activer l&apos;affichage des images en miniature</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Détails du plan de plongée&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Journal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Vue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nouveau carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Ouvrir un carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Enre&amp;gistrer sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Maj+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>P&amp;références</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importer les données &amp;GPS depuis le service web Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Informations</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Tout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Ordinateur Suiva&amp;nt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;À propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importer &amp;depuis divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Basculer en mode plein ecran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Vérifier les mises à jour</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Exporter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exporter les plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Recalculer l&apos;axe des profondeurs</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer depuis l&apos;&amp;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renuméroter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>(dés)activer la courbe de la pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>(dés)activer la courbe de la pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Éditer les noms des ordinateurs de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Ajouter une plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>&amp;Groupement automatique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Liste des plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Ordinateur P&amp;récédent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>&amp;Manuel utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lanifier une plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importer des fichiers de log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importer les journaux depuis d&apos;autres applications</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Imprimer le runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Statistiques annuelles</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Enregistrer les modifications?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Ouvrir un journal de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Journaux de plongée (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Fichiers XML (*.xml);;Fichiers UDDF/UDCF (uddf *.udcf);;Fichiers JDiveLog (*.jlb);;Fichiers Suunto (*.sde *.db);;Fichiers CSV (*.csv);;Tous fichiers(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Dernier palier à 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft à la surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Dernier palier à 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>de 50% de la profondeur moyenne à 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m à la surface</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Valeurs par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Unités</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Graphique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Utiliser les paramètres par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animations</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Supprimer les paramètres</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Remettre les paramètres par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personnalisé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>mètre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>pied cubique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Paramètre système par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Type de proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Hôte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Requiert une authentification</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Pression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listes et Tables</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Fichier de plongée par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Afficher les plongées invalidées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Bloc par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Utiliser le bloc par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Service web de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Identifiant de l&apos;utilisateur par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Sauvegarder l&apos;identifiant de l&apos;utilisateur?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Unités de temps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Secondes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Montrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow à la profondeur max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Dénominateur de vitesse de montée/descente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Seuil d&apos;affichage pour la pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Seuil d&apos;affichage pour la pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Seuil d&apos;affichage pour la pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>pO₂ max pour l&apos;affichage de la MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Afficher en rouge le plafond signalé par l&apos;ordinateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Afficher les blocs non utilisés dans l&apos;onglet des Équipements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Afficher la profondeur moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Redémarrage nécessaire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Ouvrir le fichier de plongée par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Imprimer</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface ne trouve pas d&apos;imprimante installée sur ce système!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Plongée n°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Chef</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Binôme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Plongée n°%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Profondeur max: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Durée: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gaz utilisé:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>Consommation d&apos;air:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Poids:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Chef de palanquée:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Binôme:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Combinaison:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Visi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Évaluation:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (n°%1 de %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <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="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Supprimer cet ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Ajouter un changement de gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Ajouter un signet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Supprimer l&apos;événement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Cacher les événements similaires</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Modifier le nom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Dé-sélectionner tous les évènements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Cacher les événements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Cacher tous les événements %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <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="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Modifier le nom du signet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Nom personnalisé :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Le nom est trop long !</translation>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Supprimer ce point</translation>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>pied³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Réponse invalide du serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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é lu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Le tag XML &apos;DiveDates&apos; n&apos;a pas été trouvé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Réponse XML mal formée. Ligne %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Connexion en cours...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Téléchargement terminé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Erreur de téléchargement: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Erreur de connexion : </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Téléchargement réussi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Identifiant utilisateur incorrect.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation>Entrez l&apos;Id de l&apos;utilisateur et cliquez sur télécharger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Impossible de lire la réponse</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>Vérifiez votre connexion Internet </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <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="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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à à&lt;/br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Une nouvelle version de Subsurface est disponible.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,53 +3701,58 @@ p, li { white-space: pre-wrap; }
         <translation>Les informations système suivantes seront soumises</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Système d&apos;exploitation: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Architecture CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Langue: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <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="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Ne me le demandez plus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Demander plus tard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Soumettre le sondage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Demander encore?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Envoyer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
@@ -3102,27 +3760,27 @@ OS CPU Architecture: %1</source>
 Architecture OS CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface n&apos;a pas pu soumettre le sondage.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>L&apos;erreur suivante est apparue :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Vérifiez votre connexion Internet </translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Sondage soumis avec succès</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3130,12 +3788,12 @@ Architecture OS CPU: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3183,12 +3841,12 @@ Architecture OS CPU: %1</translation>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <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="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Transfert des données en cours</translation>
     </message>
@@ -3196,97 +3854,110 @@ Architecture OS CPU: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Cliquer ici retirera ce système de poids.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Année
 &gt; Mois / Groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Durée
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Plus longue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Pronfondeur (%&amp;)
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>Consommation d&apos;air  (%1)
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3296,87 +3967,86 @@ Moyenne</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>pied³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -3418,229 +4088,229 @@ Moyenne</translation>
         <translation>Le nombre maximum de colonnes supporté pour les importations de fichiers CSV est %d.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>aucun</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>Arrêt de décompression</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>ascension</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>charge</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>transmetteur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>signet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>palier de sécurité</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>Changement de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>palier de sécurité (volontaire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>palier de sécurité (obligatoire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>Arrêt profond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (palier de sécurité)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sous profondeur plancher</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>profondeur max</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>temps d&apos;air</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>entête</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Avertissement de niveau « tissue »</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>temps sans arrêt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>numéro d&apos;événement non valide</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Impossible de créer une analyse pour %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Impossible d&apos;enregistrer les données</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Impossible d&apos;analyser l&apos;heure</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Plongée n°%d - %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Impossible d&apos;analyser le temps de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Impossible d&apos;analyser la profondeux maximale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Impossible d&apos;analyser le nombre de mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Impossible d&apos;obtenir la salinité de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erreur à l&apos;obtention de la pression en surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Impossible d&apos;analyser le mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Impossible d&apos;analyser des échantillons</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <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="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Impossible d&apos;enregistrer le gestionnaire d&apos;événement.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Impossible d&apos;enregistrer le gestionnaire d&apos;annulation.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Erreur à l&apos;import des données de plongées</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossible d&apos;ouvrir %s %s (%s)</translation>
     </message>
@@ -3652,19 +4322,19 @@ Moyenne</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossible d&apos;analyser « %s »</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Échec de la requête get_events.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Échec de la requête get_tags.
@@ -3678,36 +4348,36 @@ Moyenne</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Échec de la requête &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Échec de la requête get_cylinders.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Échec de la requête get_changes.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Échec de la requête get_profile_sample.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Impossible d&apos;ouvrir le feuille de style %s</translation>
     </message>
@@ -3717,136 +4387,136 @@ Moyenne</translation>
         <translation>Nitrox%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Ne peut pas trouver le gaz %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Trop de gaz différents</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L&apos;ALGORITHME DE BUHLMANN ET LE SIMULATEUR DE PLONGÉE N&apos;A ÉTÉ TESTÉ QUE SOMMAIREMENT. IL EST FORTEMENT CONSEILLÉ DE NE PAS PLONGER EN SE BASANT UNIQUEMENT SUR LES INDICATIONS FOURNIES ICI.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Calcule de la décompression annulé a cause d&apos;un temps excessif</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>Basé sur GFbas = %d et GFhaut = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Planification de plongée Subsurface </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>profondeur</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>durée</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Restez à %.*f %s durant %d:%02d min - runtime %d:%02u sur %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Changer de gaz vers %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>SNC</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Consommation de gaz:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Avertissement:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3855,70 +4525,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>Consommation d&apos;air en surface : %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>SNC : %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3927,7 +4597,7 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3936,70 +4606,70 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Arrêt de sécurité: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Arrêt de sécurité: temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Déco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Déco: temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>Déco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>LND : %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>DTR: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Déco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Déco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>LND:%umin (calc)
@@ -4007,192 +4677,192 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TRS:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Plafond calculé %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tissue %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>rythme cardiaque: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>palié: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sPd:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sPd:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 plongées)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 plongée)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>bateau</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>rivage</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>dérivante</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>profondeur</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>glace</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>épave</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>piscine</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>Lac</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>rivière</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nuit</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>eau douce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>étudiant</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>photo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>vidéo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instructeur</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>décompression</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4242,97 +4912,97 @@ PEDA : %d%s
         <translation>(pas de plongées)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Dim.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Lun.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Mer.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Jeu.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Ven.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sam.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Janv.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Fév.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Avril</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Juin</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Juil.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Août</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sept.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Oct.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Déc.</translation>
     </message>
@@ -4367,92 +5037,92 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Lecture %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>données</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>identifiant de l&apos;entrée dans le journal</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>identifiant du site de plongée</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>plus d&apos;identifiants de plongée</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>combinaison humide</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semi-étanche</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>Combinaison sèche</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>veste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>salopette de combinaison</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>gilet</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>Combinaison intégrale</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>Combi 2 pièces</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Initialisation de la communication</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Impossible d&apos;initialiser Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Début du téléchargement</translation>
     </message>
@@ -4547,12 +5217,279 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation>
         <translation>Alarme de batterie faible</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Impossible d&apos;ouvrir le fichier %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Heure</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Lieu</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Temp. atmosphérique</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Temp. de l&apos;eau</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistiques</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Évaluation</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Visibilité</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Binôme</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Combinaison</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Étiquettes</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Statistiques annuelles</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Année</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Temps total</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Profondeur min.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Profondeur max.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Consommation d&apos;air min.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Consommation d&apos;air max.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Temp. min.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Temp. max.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Poids</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coordonnées</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Date :</translation>
@@ -4674,37 +5611,43 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation>
         <translation>GF bas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF haut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Descendre jusqu’à la première profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Dernier palier à 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Planifier une pause sur le gaz de fond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Option de gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Consommation au fond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Consommation d&apos;air de décompression</translation>
     </message>
@@ -4719,27 +5662,33 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation>
         <translation>pO₂ de décompression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notes de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Afficher le runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>afficher la durée du segment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Afficher les transitions dans la décompression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Planning au format texte</translation>
     </message>
@@ -4765,17 +5714,17 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation>
         <translation>6m à la surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Sur la planification, afficher le runtime (durée absolue) des arrêts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Sur la planification, afficher la durée (durée relative) des arrêts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 b26b07403..d8db47f1b 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>בטל</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>סוג</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>מדריך צלילה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>בן זוג</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>ראות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>תגיות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>משקולות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>מיכלים</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -80,22 +653,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>דגם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>מזהה התקן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>כינוי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -121,14 +694,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>לדקה</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -136,87 +701,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -260,13 +825,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation type="unfinished"/>
     </message>
@@ -276,11 +841,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation type="unfinished"/>
@@ -301,143 +861,148 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF קבצי (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>קבצי HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
@@ -627,42 +1192,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation>
     </message>
@@ -670,17 +1235,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
@@ -761,67 +1326,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>לדקה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>ליברה</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>צריכת אוויר</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>ליברה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -829,95 +1424,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>שום צלילות נבחרו</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>שגיאה פנימית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>סיים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>העלאת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>הורדת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>הורדת 1% צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>ההורדה הסתיימה - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>הורדה פגומה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>לא היה אפשרות לפתוח את הארכיון:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>ההעלאה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>ההעלאה הסתיימה בהצלחה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>שגיאת התחברות (הזדהות)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>תשובה לא ברורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>שגיאה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>ההעלאה הסתיימה</translation>
     </message>
@@ -947,32 +1542,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>קבצי יומן (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>קבצי Dump (*.bin)</translation>
     </message>
@@ -1036,6 +1631,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1049,7 +1662,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
@@ -1090,27 +1703,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
@@ -1257,84 +1870,78 @@
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>צלילות מרובות בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>צלילה זו בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>לא ידוע</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1342,82 +1949,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;קובץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>הדפס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1426,454 +2048,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;יומן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;עזרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;ייבא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>יומן &amp;חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;לפתוח יומן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>שמור בשם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;הדפס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;צא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;מספר מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>שמאל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>ימין</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1881,380 +2499,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>ברירות מחדל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>יחידות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>גרף</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>שפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>אנימציות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>מהירות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>מערכת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>התאמה אישית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>ליטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>רגל מ&quot;ק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>צלסיוס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>פרנהייט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>סיסמא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>פילטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>לחץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>נפח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>יחידות זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>הצג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>שונות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>העדפות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>גרדיאנט עליון</translation>
     </message>
@@ -2279,32 +2909,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>נדרשת הפעלה מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
@@ -2326,49 +2956,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>הדפס</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>מספר צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>מדריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2431,72 +3061,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>צלילות מס %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>עומק מקסימלי: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>זמן: %1 דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>צריכת אויר:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>משקולות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>הערות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>מדריך צלילה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>בן זוג:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>חליפה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>ראות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>דירוג</translation>
     </message>
@@ -2504,82 +3134,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>הסתר אירועים דומים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>חשוף את כל האירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>הסתר אירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>הסתר את כל %1 האירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>הסר את האירוע שנבחרו?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2592,7 +3222,7 @@ p, li { white-space: pre-wrap; }
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2617,72 +3247,85 @@ p, li { white-space: pre-wrap; }
         <translation>מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>תגובה לא חוקית מהשרת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>תגובת XML פגומה. שורה %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2842,47 +3485,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>שרות איטרנט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>מתחבר...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>ההורדה הסתיימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>שם משתמש לא חוקי!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>תשובה לא מובנת!</translation>
     </message>
@@ -2898,17 +3541,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>מ&quot;ל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2944,22 +3587,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3041,76 +3694,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>שלח</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3118,12 +3776,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
@@ -3171,12 +3829,12 @@ OS CPU Architecture: %1</source>
         <translation>ההעלאה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>הפעולה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>מעביר נתונים...</translation>
     </message>
@@ -3184,97 +3842,110 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>שנה
 &gt; חודש / טיול</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>משך
 כולל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 קצר ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 ארוך ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>עומק (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>צריכת אויר (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>טמפ&apos; (%1)
@@ -3284,87 +3955,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>פסקל</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%S) או (%S)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>אוויר</translation>
     </message>
@@ -3406,229 +4076,229 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>אין</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>עצירה לדיקומפרסיה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>זמן נותר בעומק</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>עליה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>תקרה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>עומס</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>משדר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>חריגה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>סימניה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>שטח</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>עצירת בטיחות</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>החלפת גז</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>עצירת בטיחות (יזומה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>עצירת בטיחות (חובה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>עצירה בעומק</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>תקרה (עצירת בטיחות)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>זמןצלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>עומק מקס&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>זמן אויר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>כותרת</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>אזהרת רמות רקמות</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>זמן ללא עצירה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>מס&apos; ארוע שגוי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation>לא מצליח להבין %s %s </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>שגיאה ברישום המידע</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>שגיאה בקריאת תאריך</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>שגיאה בקריאת זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>שגיאה בקריאת תערובת גזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>שגיאה בקבלת מליחות מים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>שגיאה בקבלת לחץ על פני המים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>שגיאה בקריאת נקודות דגימה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>אירוע: מחכה לפעולה של המשתמש</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>שגיאה ברישום שגרת ניהול</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>שגיאת יבוא נתוני צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>לא ניתן לפתוח את %s %s (%s)</translation>
     </message>
@@ -3639,19 +4309,19 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>שאילתת מסד נתונים של Get_events נכשל
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3664,33 +4334,33 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>שאילתת מסד נתונים נכשל &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation>
     </message>
@@ -3700,452 +4370,452 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>רעילות שייורית מקסימלית %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>פעימות לב %d</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 צלילות)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 צלילה)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>ספינה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>חוף</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>סחיפה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>עמוק</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>מחילה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>קרח</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>מערה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>גובה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>ברכה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>אגם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>נחל</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>לילה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>fresh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>תלמיד</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>תצלום</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>וידאו</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>מדריך</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>דקומפרסיה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -4195,97 +4865,97 @@ EADD: %d%s
         <translation>(שום צלילות)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>ראשון</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>שני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>שלישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>רביעי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>חמישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>שישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>שבת</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>ינואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>פבואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>מרץ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>אפריל</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>מאי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>יוני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>יולי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>אוגוסט</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>ספטמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>אוקטובר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>נובמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>דצמבר</translation>
     </message>
@@ -4315,92 +4985,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>קורא %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>נתונים</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>חליפת צלילה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>חליפה יבשה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>אפוד</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>לבנים ארוכים</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>ז&apos;קט</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>חליפה מלאה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>ממברנה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>התחל הורדה</translation>
     </message>
@@ -4495,12 +5165,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>התראת סוללה חלשה</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>תאריך</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>זמן</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>טמפ&apos; האוויר</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>ראות</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>בן זוג</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>תגיות</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>סה&quot;כ זמן</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>סוג</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>גודל</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>משקל</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>קואורדינטות</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>תאריך:</translation>
@@ -4622,37 +5559,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>צריכת גז בעומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4667,27 +5610,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4713,17 +5662,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 5f38e89de..8ab8bd26c 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="hr_HR" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Vrsta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Odijelo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Voditelj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Ocjena</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Vidljivost</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Bilješke</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Boce</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -80,22 +653,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Naziv uređaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -121,14 +694,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -136,87 +701,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Otvori sve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Zatvori sve grupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Kreiraj novu grupu iznad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Spoji s grupom iznad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Spoji s grupom ispod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -260,13 +825,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation type="unfinished"/>
     </message>
@@ -276,11 +841,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation type="unfinished"/>
@@ -301,143 +861,148 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
@@ -627,42 +1192,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -670,17 +1235,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Dostupni plinovi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
@@ -761,67 +1326,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Ocjena</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -829,94 +1424,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -946,32 +1541,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -1035,6 +1630,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1048,7 +1661,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
@@ -1089,27 +1702,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
@@ -1256,84 +1869,78 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>nepoznato</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1341,82 +1948,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1425,454 +2047,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Novi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Spremi kao</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1880,380 +2498,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Jedinice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Pritisak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
@@ -2278,32 +2908,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -2325,49 +2955,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Uron br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2430,72 +3060,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,82 +3133,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2591,7 +3221,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2616,72 +3246,85 @@ p, li { white-space: pre-wrap; }
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2841,47 +3484,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Web servis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Spajanje...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Neispravna korisnička oznaka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Ne mogu obraditi odziv</translation>
     </message>
@@ -2897,17 +3540,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2943,22 +3586,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3040,76 +3693,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3117,12 +3775,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3170,12 +3828,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation type="unfinished"/>
     </message>
@@ -3183,88 +3841,101 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -3273,87 +3944,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ili (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>zrak</translation>
     </message>
@@ -3395,229 +4065,229 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>nijedan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>deko zastoj</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>izron</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>opterećenje</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>odašiljač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>povreda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>površina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>sigurnosna stanka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>promjena plina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>sigurnosna stanka (opcionalna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>sigurnosna stanka (obavezna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>dubinska stanka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (sigurnosni zastoj)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>trajanje urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Max dubina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>preostalo trajanje zraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>kurs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>upozorenje tkivo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>non stop vrijeme</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>neispravan broj događaja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Greška pri registraciji podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Događaj: čekanje na korisničku akciju</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Greška pri registraciji event handlera.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Greška pri uvozu podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
@@ -3629,19 +4299,19 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nije uspjelo parsiranje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Neuspjeo get_events na bazi.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3654,33 +4324,33 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Neuspjeo upit na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -3690,450 +4360,450 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Previše mješavina plinova</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>UPOZORENJE: OVO JE NOVA IMPLEMENTACIJA BUHLMANN ALGORITMA I PLANERA TEMELJENOG NA NJEMU KOJA JE SAMO DJELOMIČNO TESTIRANA. NIKAKO SE NE PREPORUČA PLANIRANJE URONA TEMELJEM SAMO OVIH INFORMACIJA.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>brod</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>obala</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>dubok</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>pećina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>led</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>olupina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>špilja</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>nadmorska visina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>bazen</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>jezero</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>rijeka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>noć</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>fotografija</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -4183,97 +4853,97 @@ EADD: %d%s
         <translation>(nema urona)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Uto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Sri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sub</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Sij</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Velj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Ožu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Tra</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Svi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Srp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Kol</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Ruj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Stu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Pro</translation>
     </message>
@@ -4308,92 +4978,92 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Čitanje %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>podaci</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>ID unosa u dnevniku</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>divespot data id</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>više podataka za ID urona</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>mokro odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>polusuho</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>suho odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>jakna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>kompenzator plovnosti</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>puno odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>dvodjelno odijelo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Uspostavljanje veze</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis greška pri inicijalizaciji</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Započni preuzimanje</translation>
     </message>
@@ -4488,12 +5158,279 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation>Alarm: Baterija pri izmaku</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Vrijeme</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Temp. zraka</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Temperatura vode</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistika</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Ocjena</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Vidljivost</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Odijelo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Bilješke</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Godina</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Ukupno trajanje</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min dubina</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max dubina</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Vrsta</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Veličina</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Težina</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -4615,37 +5552,43 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4660,27 +5603,33 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4706,17 +5655,17 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 4e2e8bf01..b4ce7fa26 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Merülés vezető</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Palackok</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -80,22 +653,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Típús</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -121,14 +694,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -136,87 +701,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Mind kinyit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Összes összecsukása</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Túra létrehozása fentebb</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -260,13 +825,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation type="unfinished"/>
     </message>
@@ -276,11 +841,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation type="unfinished"/>
@@ -301,143 +861,148 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
@@ -627,42 +1192,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -670,17 +1235,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
@@ -761,67 +1326,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Pal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
@@ -829,94 +1424,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -946,32 +1541,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -1035,6 +1630,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1048,7 +1661,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
@@ -1089,27 +1702,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation type="unfinished"/>
     </message>
@@ -1256,84 +1869,78 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1341,82 +1948,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1425,454 +2047,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Ment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1880,380 +2498,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Merülések</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Szűrő</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
@@ -2278,32 +2908,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -2325,49 +2955,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Merülés#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Vezető</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Társ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2430,72 +3060,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,82 +3133,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2591,7 +3221,7 @@ p, li { white-space: pre-wrap; }
         <translation>LÉG</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2616,72 +3246,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2841,47 +3484,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Csatlakozás...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Érvénytelen felhasználó azonosító</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Nem lehet feldolgozni választ!</translation>
     </message>
@@ -2897,17 +3540,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
@@ -2943,22 +3586,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3040,76 +3693,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Küldés</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3117,12 +3775,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
@@ -3170,12 +3828,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation type="unfinished"/>
     </message>
@@ -3183,88 +3841,101 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -3273,87 +3944,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vagy (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation type="unfinished"/>
     </message>
@@ -3395,229 +4065,229 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Hiba az adat regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Hiba a dátumidő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Hiba a merülési idő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Hiba a max mélység feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <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="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <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="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Hiba a minták feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <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="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <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="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <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="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Merülési adat importálási hiba</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -3628,18 +4298,18 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3651,32 +4321,32 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -3686,450 +4356,450 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>NYILATKOZAT / FIGYELMEZTETÉS: EZ EGY ÚJ IMPLEMENTÁCIÓJA A BUHLMANN ALGORITMUSNAK ÉS A MERÜLÉS TERVEZŐ EZEN ALAPSZIK, AMI CSUPÁN KORLÁTOZOTT SZÁMÚ TESZTELÉSSEL RENDELKEZIK. ERŐSEN AJÁNLJUK, HOGY NE PUSZTÁN AZ ITT KAPOTT EREDMÉNYEK ALAPJÁN LEGYEN A MERÜLÉS MEGTERVEZVE.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -4179,97 +4849,97 @@ EADD: %d%s
         <translation>(nincs merülés)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>H</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>P</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Már</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Ápr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jún</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Júl</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -4299,92 +4969,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="403"/>
-        <source>data</source>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 db teljes öltözet</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Kommunikáció kezdése</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation type="unfinished"/>
     </message>
@@ -4479,12 +5149,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Merülő Elem Riasztás</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Idő</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Lég Hőm</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min Mélység</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max Mélység</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min hőmérséklet</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max hőm</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Dátum:</translation>
@@ -4606,37 +5543,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4651,27 +5594,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4697,17 +5646,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 123dd2eb3..e38021e6a 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tipe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Pakaian</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Rekan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Peringkat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Jarak Lihat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Berat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Tabung</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -80,22 +653,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID Perangkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Nama Panggilan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -121,14 +694,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/menit</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -136,87 +701,87 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -260,13 +825,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation type="unfinished"/>
     </message>
@@ -276,11 +841,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation type="unfinished"/>
@@ -301,143 +861,148 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Ukuran Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
@@ -627,42 +1192,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Kamu hendak mengabaikan Rencana</translation>
     </message>
@@ -670,17 +1235,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
@@ -761,67 +1326,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Peringkat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/menit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -829,94 +1424,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -946,32 +1541,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -1035,6 +1630,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1048,7 +1661,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
@@ -1089,27 +1702,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
@@ -1256,84 +1869,78 @@
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>Tak dikenal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1341,82 +1948,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1425,454 +2047,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Baru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Buka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Simpan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Simpan sebagai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Print</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Cltrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Kiri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Kanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1880,380 +2498,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Acuan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Satuan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Ukuran Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalisasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Saring</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Tekanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Satuan Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Detik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Tampilkan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Lain-lain</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Preferensi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2278,32 +2908,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -2325,49 +2955,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Selam#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Kedalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2430,72 +3060,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Selam #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Kedalaman Maks: 1% 2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Durasi: %1 menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,82 +3133,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2591,7 +3221,7 @@ p, li { white-space: pre-wrap; }
         <translation>UDARA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2616,72 +3246,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2841,47 +3484,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>identifikasi pengguna tidak cocok!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Respon gagal di telaah!</translation>
     </message>
@@ -2897,17 +3540,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2943,22 +3586,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3040,76 +3693,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3117,12 +3775,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
@@ -3170,12 +3828,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation type="unfinished"/>
     </message>
@@ -3183,95 +3841,108 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Total Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Terpendek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Terjauh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dalam (%1)
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3281,87 +3952,86 @@ Rata-rata</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>udara</translation>
     </message>
@@ -3403,229 +4073,229 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>kosong</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>pemberhentian deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>nai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>batas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>beban kerja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>pemancar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>gangguan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>tandai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>permuakaan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>ganti gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (bebas)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (wajib)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>batas (safety stop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>waktu selam</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>dalam maks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>waktu mengudara</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>judul</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>peringatan tingkat jaringan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>waktu non stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>nomor kejadian tidak sesuai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Gagal mendaftarkan data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Gagal mengurai tanggal</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Gagal mengurai waktu selam</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Gagal mengurai kedalamn maks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gagal mengurai perhitungan campuran gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -3636,18 +4306,18 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3659,32 +4329,32 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -3694,450 +4364,450 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -4187,97 +4857,97 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation type="unfinished"/>
     </message>
@@ -4307,92 +4977,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="403"/>
-        <source>data</source>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation type="unfinished"/>
     </message>
@@ -4487,12 +5157,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Tanggal</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Peringkat</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Jarak Lihat</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Rekan</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Pakaian</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Waktu Keseluruhan</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tipe</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Ukuran</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Berat</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinat</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation type="unfinished"/>
@@ -4614,37 +5551,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC  bawah</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4659,27 +5602,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4705,17 +5654,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 e035c8e50..405ac1521 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -1,6 +1,513 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <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="206"/>
+        <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="432"/>
+        <source>Setting successfully written to device</source>
+        <translation>Impostazioni salvate correttamente sullo strumento </translation>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation>Backup</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation>Numero seriale</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation>Inglese</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation>Tedesco</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation>Francese</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation>Italiano</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation>MMDDYY</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation>DDMMYY</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation>YYMMDD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation> m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation>Medium</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation>Alto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation>2s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation>10s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation>Rosso</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation>Verde</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation>Blu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation>Sincronizza l&apos;ora del computer con il PC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation>%O2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation>%He</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation>Gas 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation>Gas 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation>Gas 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation>Gas 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation>Gas 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation>Dil 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation>Dil 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation>Dil 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation>Dil 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation>Dil 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation>SP 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation>SP 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation>SP 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation>SP 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation>SP 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation>Dettagli del computer letti correttamente.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation>Backup delle impostazioni del computer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation>Backup files (*.xml)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation>Errore nel Backup XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <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="405"/>
+        <source>Backup succeeded</source>
+        <translation>Backup eseguito con successo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <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="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation>Ripristina le impostazioni del computer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation>Errore di ripristino XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <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="431"/>
+        <source>Restore succeeded</source>
+        <translation>Ripristino avvenuto con successo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <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="443"/>
+        <source>Select firmware file</source>
+        <translation>Seleziona il file del firmware</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation>Tutti i file (*.*)</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +550,90 @@
         <translation>Cambia a</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliccando qui si rimuove la bombola.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>La bombola non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation>Selezione del componente</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation>Quali dettagli vorresti copiare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Luogo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Muta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation>Coordinate GPS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Compagno</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Valutazione</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Visibilità</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Note</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Pesi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Bombole</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +656,22 @@ il computer selezionato?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Nickname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Cliccando qui si rimuoverà il computer.</translation>
     </message>
@@ -122,14 +697,6 @@ il computer selezionato?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +704,87 @@ il computer selezionato?</translation>
         <translation>Mostra la finestra di ricerca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Espandi tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Minimizza tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Collassa altri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Rimuove immersione(i) dal viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Crea un nuovo viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Cancella immersione(i)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <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="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Fondi le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Rinumera le immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Cambia gli orari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Carica immagini</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Apri files di immagine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +828,13 @@ il computer selezionato?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Immersioni selezionate</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Tutte le immersioni</translation>
     </message>
@@ -277,11 +844,6 @@ il computer selezionato?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Versione minima Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Esporta log immersione su file </translation>
@@ -302,143 +864,148 @@ il computer selezionato?</translation>
         <translation>Numerazione di Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation>Esporta le statistiche annuali</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Esporta solo la lista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Opzioni stile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Grandezza font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Luce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sabbia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>File UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Valori separati da virgole che includono le informazioni più importanti del profilo di immersione.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo di Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Esporta file UDDF come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Esporta file CSV come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Esporta il mappamondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>File HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Esporta Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Esporta file HTML come</translation>
     </message>
@@ -628,42 +1195,42 @@ il computer selezionato?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Run Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gas utilizzato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Eliminare il piano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Stai cancellando il piano</translation>
     </message>
@@ -671,17 +1238,17 @@ il computer selezionato?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Punti del pianificatore di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Miscele disponibili</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Aggiungi punto del profilo di immersione</translation>
     </message>
@@ -762,67 +1329,97 @@ il computer selezionato?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Valutazione</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Durata</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>CNS massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation>Prof. (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1427,95 @@ il computer selezionato?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>nessuna immersione è selezionata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>Errore dell&apos;applicazione: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>errore interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Fatto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Sto caricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Sto scaricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Sto scaricando %1 immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Scaricamento finito - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Scaricamento corrotto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Caricamento fallito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Caricamento eseguito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Accesso fallito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Non riesco ad analizzare la risposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Errore: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Caricamento finito</translation>
     </message>
@@ -948,32 +1545,32 @@ il computer selezionato?</translation>
         <translation>Cerca computer Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Files di Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>File di dump (*.bin)</translation>
     </message>
@@ -1037,6 +1634,24 @@ il computer selezionato?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Salva il file di dump di libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation>Scarica in un nuovo viaggio</translation>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <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="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Non è stato possibile collegarsi al computer subacqueo.</translation>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1665,7 @@ il computer selezionato?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
@@ -1091,27 +1706,27 @@ il computer selezionato?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Note di immersione</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Temperatura atmosferica</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
@@ -1258,67 +1873,61 @@ il computer selezionato?</translation>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. aria [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. acqua [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Questo viaggio è stato editato.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Si stanno modificando immersioni multiple.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Si sta modificando questa immersione </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Note di viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Luogo del viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>sconosciuto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Immersione più profonda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Immersione più superficiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1936,17 @@ mixati con aria e usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Elimino le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Stai per cancellare le modifiche.</translation>
     </message>
@@ -1345,82 +1954,97 @@ mixati con aria e usando:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Visualizza il grafico pHe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Abilita il calcolo su tutti i tessuti</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Visualizza il ceiling calcolato dal computer subacqueo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Visualizza il ceiling calcolato</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Visualizza NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Mostra il ceiling calcolato con incrementi di 3m</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation>Ripianifica &amp;immersione</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Visualizza il battito cardiaco</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Visualizza la MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Visualizza EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Visualizza il consumo equivalente di superficie</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Mostra il righello</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Abilita la visualizzazione delle miniature delle immagini</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dettagli immersione&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Stampa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2057,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nuovo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Apri logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl-O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Sal&amp;va come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>P&amp;referenze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importa dati &amp;GPS dal web service Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation>&amp;Copia dettagli immersione</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation>&amp;Incolla dettagli immersione</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profilo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Tutti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Prossimo computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Informazioni su &amp;Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importa da Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Tutto Schermo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Abilita Modalità Tutto Schermo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Controlla aggiornamenti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Esporta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Esporta log immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Cambia la scala dell&apos;asse della profondità</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation>Riscala il grafico</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation>Mostra le immagini</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Stampa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importa &amp;dal computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Rinumera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Mostra il grafico della pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Mostra il grafico della pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Modifica il nome della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Aggiungi immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Raggruppamento Automatico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Lista immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Computer precedente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>&amp;Manuale utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Pianifica immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importa logbook da file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importa log delle immersioni da altra applicazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Apri file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Stampa la tabella con il runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Statistiche Annuali</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Salvo le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Apri file come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Apri file di log immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2508,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>piedi/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Ultima sosta a 20 piedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <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="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20 piedi alla superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Ultima sosta a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <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="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m alla superficie</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation>cuft/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Unità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Grafico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Lingua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Grandezza font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Usa il default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Velocità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Cancella tutte le impostazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Riporta tutte le impostazioni ai valori iniziali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalizza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>piedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>piedi cubici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Impostazione di sistema predefinita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Tipo di proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Richiede autenticazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Nome utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Pressione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Liste e tabelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>File del log delle immersioni di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Visualizza le non valide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Bombola di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Usa la bombola di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface web service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>ID utente di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Salvare ID utente localmente?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Unità di Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Secondi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow alla massima profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Denominatore della risalita/discesa </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Soglia quando è visibile la pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Soglia quando è visibile la pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Soglia quando è visibile la pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Massima pO₂ a cui mostrare la MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Colora di rosso il ceiling riportato dal computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Mostra bombole non utilizzate nel pannello dell&apos;attrezzatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Mostra profondità media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2918,32 @@ p, li { white-space: pre-wrap; }
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Richiesto riavvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Apri il log delle immersioni di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
@@ -2333,49 +2965,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Stampa</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface non trova nessuna stampante su questo computer!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Immersione nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation>Subsurface non trova una stampante adatta su questo computer!</translation>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3070,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Immersione nº%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Massima profondità: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gas usato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Tags:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Pesi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Muta:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Valutazione:</translation>
     </message>
@@ -2511,82 +3143,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation>(nº%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Rendilo computer principale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Cancella questo computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Aggiungi un cambio gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Aggiungi un segnalibro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Rimuovi evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Nascondi eventi simili</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Modifica il nome</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Mostra tutti gli eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Nascondi gli eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Nascondi tutti gli eventi %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Rimuovere l&apos;evento selezionato?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Modifica il nome del bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Nome personalizzato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Il nome è troppo lungo</translation>
     </message>
@@ -2599,7 +3231,7 @@ p, li { white-space: pre-wrap; }
         <translation>ARIA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Rimuovi questo punto</translation>
     </message>
@@ -2624,72 +3256,85 @@ p, li { white-space: pre-wrap; }
         <translation>Massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Risposta non valida dal server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Risposta XML malformata. Linea %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <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="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Non è stato possibile connettersi al computer subacqueo.</translation>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3494,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>In connessione...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Download finito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Errore scaricamento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Errore di connessione:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Scaricamento eseguito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Identificatore dell&apos;utente non valido!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Non posso analizzare la risposta!</translation>
     </message>
@@ -2905,17 +3550,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3596,32 @@ p, li { white-space: pre-wrap; }
         <translation>Per favore controlla la tua connessione Internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Stai usando l&apos;ultima versione di Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>È disponibile una nuova version di Subsurface.&lt;br/&gt;Puoi scaricarla qui: &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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;È disponibile una nuova versione di Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation>La versione più recente è</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3703,85 @@ p, li { white-space: pre-wrap; }
         <translation>Oltre al sondaggio, verranno inviate anche le seguenti informazioni sul tuo computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
  Sistema Operativo: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Architettura CPU : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Lingua: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Possiamo richiedertelo in seguito?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Non chiedermelo di nuovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Chiedi in seguto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Invia il sondaggio.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Chiedo di nuovo?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Invia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS Architettura CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Si è verificato il seguente errore:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Sondaggio inviato con successo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3789,12 @@ OS Architettura CPU: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3842,12 @@ OS Architettura CPU: %1</translation>
         <translation>Invia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>L&apos;operazione è durata troppo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Trasferimento dati...</translation>
     </message>
@@ -3195,97 +3855,110 @@ OS Architettura CPU: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Cliccando qui verrà rimossa la zavorra.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <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="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Non è stato possibile connettersi al computer subacqueo.</translation>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Anno 
 &gt; Mese / Viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>n</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Durata 
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Più lunga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profondità (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3295,87 +3968,86 @@ Media</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>piedi/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
@@ -3417,229 +4089,229 @@ Media</translation>
         <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>nessuno</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>risalita</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>carico di lavoro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>trasmettitore</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>violazione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>segnalibro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>sosta di sicurezza</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>cambio gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>sosta di sicurezza (facoltativa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>sosta di sicurezza (obbligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (sosta di sicurezza)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>durata immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sotto il piano</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>tempo in aria</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>intestazione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>avviso del livello dei tessuti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>tempo di non stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>numero evento non valido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Errore registrando la data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Errore analizzando la data/il tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Immersione #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Errore analizzando la profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <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="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
@@ -3652,19 +4324,19 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossibile analizzare  &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Interrogazione get_events fallita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>La query get_tags sul database non è riuscita.
@@ -3678,29 +4350,29 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Interrogazione al database fallita &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>La query get_cylinders sul database non è riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>La query get_changes sul database non è riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>La query get_profile_sample sul database non è riuscita.
@@ -3708,7 +4380,7 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Non é possibile aprire il foglio di stile %s</translation>
     </message>
@@ -3718,136 +4390,136 @@ Media</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Non trovo il gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Troppe miscele gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Piano di immersione di Subsurface </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>profondità</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>durata</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Passa al gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Consumo gas:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3856,70 +4528,70 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P:%d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂ %s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3928,7 +4600,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3937,261 +4609,261 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: temo di sosta sconosciuto @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Ceiling calcolato %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tessuto %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>Battito cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>Direzione: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 immersioni)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 immersione)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>barca</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>riva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>in corrente</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>profondo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>ghiaccio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>relitto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>grotta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>altitudine</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>fiume</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>notte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>acqua dolce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>allievo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>istruttore</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4241,97 +4913,97 @@ EADD: %d%s
         <translation>(nessuna immersione)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Gen</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -4366,92 +5038,92 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Sto leggendo %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>id del log d&apos;immersione</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation>divelog #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>data id di divespot</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation>luogo di immersione #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>più id di dati d&apos;immersione</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation>dettagli per #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>muta umida</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semi stagna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>Muta stagna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>maglia</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>GAV</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>muta intera</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>Muta intera 2 pezzi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Inizializzo la comunicazione</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Impossibile inizializzare l&apos;Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Inizio download</translation>
     </message>
@@ -4546,12 +5218,279 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>Allarme: Batteria scarica</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Non posso aprire il file %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation>Numero</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Ora</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Luogo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Temperatura aria</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Temperatura dell&apos;acqua</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation>immersioni</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation>Espandi tutto</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation>Comprimi tutto</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation>viaggi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistiche</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation>Ricerca avanzata</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Valutazione</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Visibilità</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation>DiveMaster</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Compagno</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Muta</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Note</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation>Mostra maggiori dettagli</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Statistiche Annuali</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Anno</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Tempo Totale</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation>Durata media</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation>Durata più breve</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation>Durata più lunga</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation>Profondità media</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Profondità Minima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Profondità Massima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation>SAC medio</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min. CAS</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>CAS Massimo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation>Temperatura media</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Temperatura Minima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Temperatura Massima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation>Indietro alla lista</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation>Immersione n.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation>Profilo di immersione</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation>informazioni dell&apos;immersione</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation>Attrezzatura</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Dimensione</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation>Pressione di esercizio</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation>Pressione iniziale</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation>Pressione finale</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation>Eventi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation>Valore</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coordinate</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation>Stato dell&apos;immersione</translation>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -4673,37 +5612,43 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Discesa immediata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Ultima sosta a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Pianifica i break in backgas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Impostazioni gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>CAS sul fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>SAC in deco</translation>
     </message>
@@ -4718,27 +5663,33 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>pO₂ in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Note di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Mostra il runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Mostra la durata del segmento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Mostra i cambi tappa in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Piano di immersione dettagliato</translation>
     </message>
@@ -4764,17 +5715,17 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>6m alla superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 a84890d54..0438d56c8 100644
--- a/translations/subsurface_lv_LV.ts
+++ b/translations/subsurface_lv_LV.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="lv_LV" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Atcelt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tips</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Pārslēgties uz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Noklikšķot šeit Jūs noņemsiet balonu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Balons never būt noņemts.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Kostīms</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Niršanas speciālists</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Draugs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Redzamība</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Sver</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Cilindri</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modelis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Ierīces ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Lietotājvārds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Noklikšķot šeit Jūs noņemsiet niršanas datoru.</translation>
     </message>
@@ -122,14 +695,6 @@ likvidēt izvēlētus datorus?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Parādīt meklēšanas logu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Izvērst visu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Savērst visu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Savērst pārējus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Izveidot jaunu ceļojumu augšup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Izdzēst niršanu(-as)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <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="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Saplūdināt izvēlētas niršanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Pārnumurēt niršanu(-as)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Nobīdīt laikus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Ielādēt attēlus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Atvērt attēla failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ likvidēt izvēlētus datorus?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Izvēlētas niršanas</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Visas niršanas</translation>
     </message>
@@ -277,11 +842,6 @@ likvidēt izvēlētus datorus?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimālais Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Niršanas žurnālu eksportēšana</translation>
@@ -302,143 +862,148 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Numuri Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Eksportēt tikai sarakstu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Stila opcijas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Fonts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Fonta izmērs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tēma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Gaišs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Smilts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF faili (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV faili (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Eksportēt UDDF failu kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Eksportēt CSV failu kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Eksportēt pasaules karti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML faili (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Eksportēt Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML faili (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Eksportēt HTML failus, kā</translation>
     </message>
@@ -628,42 +1193,42 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Gala dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Izpildes laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Izm. gāze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC regulēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Atcelt plānu?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Jūs taisāties atcelt plānu.</translation>
     </message>
@@ -671,17 +1236,17 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Niršanas vietas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Pieejamas gāzes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Pievienot niršanas vietu</translation>
     </message>
@@ -762,67 +1327,97 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Minūtes</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Balons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Maks. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>mārciņa</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>neviena niršana nebija izvēlēta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>nevar izveidot pagaidu failu: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>iekšēja kļūda: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>iekšēja kļūda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Izdarīts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Augšupielādē niršanas sarakstu...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Niršanas saraksta lejupielādēšana...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Lejupielādē %1 niršanas...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Lejupielādēšana pabeigta - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Bojāta lejupielādēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Augšupielādēšana neizdodas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Sekmīga augšupielādēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Pieteikšanās neizdevās</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Nevar noparsēt atbildi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Kļūda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Augšupielādēšana ir pabeigta</translation>
     </message>
@@ -948,32 +1543,32 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Atrast Uemis niršanas datoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Žurnalēšanas faili (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Izraksta faili (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ likvidēt izvēlētus datorus?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Saglabāt libdivecomputer izraksta failu</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ likvidēt izvēlētus datorus?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
@@ -1091,27 +1704,27 @@ likvidēt izvēlētus datorus?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Niršanas piezīmes</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Gaisa temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Ūdens temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Piezīmes</translation>
     </message>
@@ -1258,84 +1871,78 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Dzēst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Gaisa temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Ūdens temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Ceļojuma rediģēšana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <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="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Niršanas rediģēšana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Ceļojuma piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Ceļojuma vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>nezināms</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Visdziļākā niršana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>un</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Atcelt izmaiņas?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Jūs taisāties atcelt izmaiņas.</translation>
     </message>
@@ -1343,82 +1950,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Fails</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Pārslēgt pHe grafiku</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Pārslēgt NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Pārslēgt pulsu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Pārslēgt MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Pārslēgt EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Niršanas plāna detaļas&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Drukāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1431,454 +2053,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Žurnāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Skats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Palīdzība</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Imports</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Jauns žunāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Atvērt žurnālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Atvērt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Saglabāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Saglabāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+w</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Preferences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importēt &amp;GPS datus no Subsurface servissa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>Profils</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Visi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Nākamais DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Par Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Karte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importēt &amp;no divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Pilnekrāns</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Pārslēgt pilnekrāna režīmu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation> &amp;Pārbaudīt atjaunāšanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>Eksports</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Žurnāla Eksports </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Manīt asa mērogu</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Drukāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Pabeigt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importēt no &amp;niršanas datora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Pārnumurēt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Pārslēgt pO₂ grafiku</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Pārslēg pN₂ grafiku</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Rediģēt ierīces vārdu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Pievienot niršanu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>&amp;Auto-grupēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Gada statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Niršanas saraksts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Pa kreisi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Pa labi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Plānotājs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importēt žurnalēšanas failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importēt žurnālus no citām programmām</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Atvērt failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Izdrukāt niršanas tabulu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Gada statistika</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Saglabāt izmaiņas?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Atvērt niršanas žurnālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Niršanas žurnāla faili (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1886,380 +2504,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Pēdējā pietura pie 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Pēdējā pietura pie 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Noklusējumi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Mērvienības</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Grafiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Valoda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Tīkls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Fonts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Fonta izmērs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Niršanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animācija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Ātrums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Dzēst visus iestatījumus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistēma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrisks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperiāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalizēt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metrs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litrs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fārenheita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Sistēmas noklusējama iestādīšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy veids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Vajadzīga autorizācija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Lietotājvārds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtrs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Spiediens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Saraksti un tabulas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Noklusējama niršanas datne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Izrādīt nederīgu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Noklusējamais balons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Izmantot noklusējamo balonu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface tīmekļa serviss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Lietotāja ID pēc noklusējama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Saglabāt lietotāja ID lokāli?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Tilpums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatūra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Laika mērvienības</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minūtes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekundes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Parādīt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow maks. dziļumā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Dažāds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Priekšrocības</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Pacelšanas/nolaišanas ātruma saucējs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Sliekšņu vērtība pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>sliekšņu vērtība pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>sliekšņu vērtība pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>maks ppO₂ parādot MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Parādīt vidējo dziļumu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2284,32 +2914,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Ir nepieciešams restarts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Atvērt noklusējamo žurnalēšanas datni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
@@ -2331,49 +2961,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Drukāt</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Niršana#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Speciālists</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2436,72 +3066,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Niršana #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Maks. dziļums: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Ilgums: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Izm. gāze:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Tagi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Krava:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Piezīmes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Niršanas speciālists:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Draugs:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Kostīms:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Redz.:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Novērtējums:</translation>
     </message>
@@ -2509,82 +3139,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 no %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Padarīt niršanas datoru par pirmo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Nodzēst šo niršanas datoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Pievienot gāzes maiņu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Pievienot grāmatzīmi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Noņemt notikumu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Paslēpt līdzīgus notikumus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Rediģēt vārdu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Parādīt visus notikumus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Paslēpt notikumus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Paslēpt visus %1 notikumus?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Nodzēst izvēlēto notikumu?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <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="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Vārds:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2597,7 +3227,7 @@ p, li { white-space: pre-wrap; }
         <translation>Gaisa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Noņemt šo vietu</translation>
     </message>
@@ -2622,72 +3252,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maksimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>kub. pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Nederīga servera atbilde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2847,47 +3490,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Tīmekļserviss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Pieslēdzas...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Lajupielādēšana pabeigta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Lejupielādēšanas kļūda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Savienojuma kļūda:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Lejupielādēšana ir sekmīga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Nepareizs lietotāja identifikators!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Nevar saparsēt atbildi!</translation>
     </message>
@@ -2903,17 +3546,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2949,22 +3592,32 @@ p, li { white-space: pre-wrap; }
         <translation>Lūdzu, pārbaudiet interneta pieslēgšanu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Jūs izmantojat aktuālako Subsurface versiju.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Jauna Subsurface versija ir pieejama.&lt;br/&gt;Noklikšķiet šeit:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;, lai to lejupielādētu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Ir pieejama jauna Subsurface versija.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3046,80 +3699,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operētājsistēma: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU Arhitektūra: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Valoda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Vairs nejautāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Pajautāt vēlāk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Pajautāt velreiz?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arhitektūra: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Sekojoša kļūda gadījas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3127,12 +3785,12 @@ OS CPU Arhitektūra: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3180,12 +3838,12 @@ OS CPU Arhitektūra: %1</translation>
         <translation>Augšupielādēt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <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="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Datu pārvietošana...</translation>
     </message>
@@ -3193,97 +3851,110 @@ OS CPU Arhitektūra: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tips</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Noklikšķot šeit Jūs noņemsiet svara sistēmu.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Gads
 &gt; Mēnesis / Ceļojums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Ilgums
 Kopā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Īsakais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Garākais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dziļums (%1)
 Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maksimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3293,87 +3964,86 @@ Vidējais</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>paskāls</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vai (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>gaiss</translation>
     </message>
@@ -3415,229 +4085,229 @@ Vidējais</translation>
         <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>neviens</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>deko pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>stāvums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>maksimāla dekompr. pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>darba slodze</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>raidītājs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>pārkapšana</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>grāmatzīme</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>virsma</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>drošības pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gāzes maiņa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>drošības pietura (brīvprātīga)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>drošības pietura (obligāta)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>dziļa pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>maksimāla dekompr. pietura (drošības pietura)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>niršanas laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>zemāk par grīdu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>skābekļa laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>virziens</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>audu līmeņa brīdinājums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>bes apstāšanas laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>kļūdains notikuma numurs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Kļūda reģistrējot datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Kļūda parsējot laiku</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Kļūda parsējot niršanas laiku</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kļūda parsējot maks. dziļumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Kļūda ūdens sāļuma noteikšanā</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kļūda spiediena noteikšanā uz virsmu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Kļūda parsējot gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Kļūda parsējot paraugus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Notikums: gaida lietotāja darbību</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <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="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Kļūda importējot niršanas datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nevar atvērt %s %s (%s)</translation>
     </message>
@@ -3649,19 +4319,19 @@ Vidējais</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Kļūme datubāzes vaicājumā get_events.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Neizdevas datubāzes pieprasījums get_tags.
@@ -3675,36 +4345,36 @@ Vidējais</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Neizdevas datubāzes pieprasījums get_cylinders.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Neizdevas datubāzes pieprasījums get_changes.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Neizdevas datubāzes pieprasījums get_profile_sample.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nevar atvērts stila lapu %s</translation>
     </message>
@@ -3714,136 +4384,136 @@ Vidējais</translation>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Nevar atrast gāzi %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Parāk daudz gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface niršanas plāns</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>dziļums</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>izpildlaiks</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>ilgums</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gāze</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Pārslēgt gāzi uz %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gāzes patēriņš:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Brīdinājums:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3852,70 +4522,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>S: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>Ā: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3924,7 +4594,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3933,49 +4603,49 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Drošības apstāšana: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Drošības apstāšana: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Dekompr.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Dekompr.: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>Dekompresijā
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
@@ -3984,213 +4654,213 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Dekompr.: %umin @ %.0f%s (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Dekompresijā (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Aprēķināta maks. dekompr. pietura %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Audu līmenis %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>sirdspuksti: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>azimuts: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 niršanas)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 niršana)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>kuģis</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>krasts</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>straume</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>dziļums</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>ala</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>ledus</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>šķembas</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>ala</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>augstiene</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>baseins</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>ezers</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>upe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nakts</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>svaigs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>students</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instruktors</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>dekompr.</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4240,97 +4910,97 @@ EADD: %d%s
         <translation>(nav niršanas)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Svēt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Pirm</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Otr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Treš</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Cet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Piekt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sest</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Maijs</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jūn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jūl</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -4365,92 +5035,92 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Nolasa %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>dati</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>žurnāla pieraksta ID</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>niršanas vietas ID</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>Niršanas papilddatu ID</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>Slapjš kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>pussauss</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>Sauss kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>īss</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>veste</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>kombinezons</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>jaka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>Pilns kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2-daļu kostīms</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrāna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Sakaru inicializēšana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Kļūme inicializējot Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Uzsākt lejupielādi</translation>
     </message>
@@ -4545,12 +5215,279 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation>Trauksme: mazs baterijas lādiņš</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nevar atvērt failu %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Datums</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Laiks</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Redzamība</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Draugs</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Kostīms</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Gada statistika</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Kopējais laiks</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tips</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Izmērs</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Svars</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinātas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Datums:</translation>
@@ -4672,37 +5609,43 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Pēdējā pietura pie 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gāzes opcijas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Apakšējais SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
@@ -4717,27 +5660,33 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation>Deko pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Niršanas piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Izrādīt izpildlaiku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4763,17 +5712,17 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 5f8f8a379..223636c19 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Gassbytte ved</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klikk her for å fjerne denne flaska.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Sted</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Drakt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Dykkeleder</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Vurdering</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Sikt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notater</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Emner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Vekter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Flasker</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -80,22 +653,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Enhets-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klikk her for å fjerne denne dykkecomputeren.</translation>
     </message>
@@ -121,14 +694,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -136,87 +701,87 @@
         <translation>Vis søkeboks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Fold ut turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Fold sammen turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Slå sammen andre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Fjern dykk fra tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Lag ny tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Slå samme tur med turen over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Slå sammen tur med turen under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Slett dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marker dykk som ugyldige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Slå sammen valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Renummerer dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Flytt tidspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Last inn bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Åpne bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -260,13 +825,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Valgte dykk</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Alle dyk</translation>
     </message>
@@ -276,11 +841,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimalt med javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Eksporter loggfiler</translation>
@@ -301,143 +861,148 @@
         <translation>Subsurface-tall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Bare eksporter liste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Stilvalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Skriftstørrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Lys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV-filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Kommaseparerte verdier som inkluderer mesteparten av informasjonen fra dykkeprofilen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface sitt eget XML-format.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Eksporter UDDF-filer som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Eksporter CSV-file som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Eksporter verdenskart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML-filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Eksporter Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML-filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Eksporter HTML-filer som</translation>
     </message>
@@ -627,42 +1192,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Siste dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Løpetid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gassforbruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC settpunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Slett planen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Du er i ferd med å forkaste planen.</translation>
     </message>
@@ -670,17 +1235,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Punkter i dykkplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Tilgjengelige gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Legg til punkt</translation>
     </message>
@@ -761,67 +1326,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Vurdering</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Min</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>pund</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -829,95 +1424,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>ingen dykk valgt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>klarte ikke å lage midlertidig fil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>intern feil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>intern feil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Laster opp liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Laster ned liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Laster ned %1 dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Nedlasting er ferdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Nedlastingen er skadet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Opplasting feilet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Ferdig å laste opp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Innlogging feilet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke lese svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Feil: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Opplasting er ferdig</translation>
     </message>
@@ -947,32 +1542,32 @@
         <translation>Finn Uemis dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dumpfiler (*.bin)</translation>
     </message>
@@ -1036,6 +1631,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Lagre dumpfil fra libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1049,7 +1662,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -1090,27 +1703,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notater</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Vanntemp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
@@ -1257,67 +1870,61 @@
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Vanntemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Denne turen redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flere dykk redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Dette dykket redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Turnotater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Tursted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>ukjent</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Dypeste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Grunneste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1326,17 +1933,17 @@ fra luft og bruker:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>og</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Slette endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Du er i ferd med å droppe endringene dine.</translation>
     </message>
@@ -1344,82 +1951,97 @@ fra luft og bruker:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Skru pHe-graf av/på</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Skru av/på utregning av vev</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Skru av/på dekograf fra computer</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Skru av/på dekograf</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Skru av/på NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Skru av/på 3m-inkrementer for dekotak</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Skru av/på hjertefrekvens</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Skru av/på MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Skru av/på EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Skru av/på SAC</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Skru av/på linjal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Skru av/på minibilder</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detaljer for dykkeplan&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1432,454 +2054,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Åpne l&amp;oggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Åpne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importer &amp;GPS-data fra Subsurface webtjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Neste computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Om Subsurf&amp;ace</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importer &amp;fra divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fullskjerm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Fullskjerm av/på</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Se etter oppdateringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksport</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Eksporter dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Skaler dybdeakse på nytt</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer fra &amp;dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>Nummere&amp;r på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Skru av/på pO₂-graf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Skru av/på  pN₂-graf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Rediger &amp;enhetsnavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Legg til dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Auto&amp;grupper</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Årsstatistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Dykkeliste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Fo&amp;rrige computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Høyre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Bruker&amp;manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lanlegg dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importer loggfiler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importer dykkelogg fra andre programmer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Skriv ut løpetidstabel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Årsstatistikk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Lagre endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Lagre fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Åpne dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Loggfiler (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML-filer (*.xml);;UDDF/UDCF-filer (*.uddf *.udcf);;JDiveLog-filer (*.jlb);;Suunto-filer (*.sde *.db);;CSV-filer (*.csv);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1887,380 +2505,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Siste stopp ved 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% av snittdybde til 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft til overflaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Siste stopp ved 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdybde til 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m til overflaten</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Standardvalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Nettverk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Skriftstørrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Bruk standard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animasjoner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Hastighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Slett alle valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Tilbakestill valg til standardverdier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personaliser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Systemstandard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxytype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Tjener</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Krever autentisering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Brukernavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Trykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Lister og tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Standard loggfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Vis ugyldige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Standardflaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Bruk standardflaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface webtjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Standard bruker-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Lagre bruker-ID lokalt?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Tidsenheter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GF lav ved maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Ymse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Tidsenhet for opp- og nedstigning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Grense når  pO₂ vises</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Grense når  pN₂ vises</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Grense når pHe vises</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Maks  pO₂ når MOD vises</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Farg dekograf fra dykkecomputer i rødt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Vis ubrukte flasker i utstyrsfanen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Vis snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GF lav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GF høy</translation>
     </message>
@@ -2285,32 +2915,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS-proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Programmet må startes på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Åpne standardloggfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
@@ -2332,49 +2962,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface finner ingen skrivere</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Dykk nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2437,72 +3067,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Dykk nr. %1- %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Varighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gassforbruk:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Emneord:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Vekter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Dykkeleder:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -2510,82 +3140,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 av %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Gjør til første dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Slett denne dykkecomputeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Legg til gassbytte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Legg til bokmerke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Fjern hendelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Skjul lignende hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Vis alle hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Skjul hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Skjul alle %1 hendelser?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Fjern den valgte hendelsen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Rediger navn på bokmerke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Tilpasset navn:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Navnet er for langt</translation>
     </message>
@@ -2598,7 +3228,7 @@ p, li { white-space: pre-wrap; }
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Fjern dette punktet</translation>
     </message>
@@ -2623,72 +3253,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Ugyldig svar fra tjener</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Feil formattert XML-svar. Linje %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2848,47 +3491,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Nettjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Kobler til...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Nedlasting er ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Feil ved nedlasting: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Forbindelsesfeil:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Nedlasting ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruker-ID!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke lese svar!</translation>
     </message>
@@ -2904,17 +3547,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2950,22 +3593,32 @@ p, li { white-space: pre-wrap; }
         <translation>Sjekk internettforbindelsen din.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Du bruker den siste versjonen av Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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 versjon av Subsurface er tilgjengelig.&lt;br/&gt;Klikk på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; for å laste ned.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;En ny versjon av Subsurface er tilgjengelig.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3047,77 +3700,82 @@ p, li { white-space: pre-wrap; }
         <translation>Den følgende informasjonen om systemet ditt blir også lagt ved</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>Operativsystem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>Prosessorarktitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>Språk: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <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="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Ikke spør meg igjen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Spør senere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Send inn brukerundersøkelse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Spørre igjen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Send</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU-arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Den følgende feilen inntraff:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Sjekk internettforbindelsen din.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Undersøkelsen er sendt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3125,12 +3783,12 @@ OS CPU-arkitektur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3178,12 +3836,12 @@ OS CPU-arkitektur: %1</translation>
         <translation>Last opp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Handlingen fikk tidsavbrudd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -3191,97 +3849,110 @@ OS CPU-arkitektur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Klikk her for å fjerne dette vektsystemet.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Varighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Lengst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dybde (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3291,87 +3962,86 @@ Snitt</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -3413,229 +4083,229 @@ Snitt</translation>
         <translation>Maks antall kolonner i CSV-importen er %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>ingen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>dekostopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>oppstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>tak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>arbeidsbelastning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>brudd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>bokmerke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>overflate</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>sikkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gassbytte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>sikkerhetsstopp (frivillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>sikkerhetsstopp (obligatorisk)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>dypstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>tak (sikkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>under tak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>lufttid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>retning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Advarsel: nivå i vev</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>tid uten stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>ugyldig hendelsesnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Feil ved registrering av data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Feil ved lesing av dato</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Dykk %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Feil ved lesing av dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Feil ved lesing av maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Klarte ikke å hente overflatetrykk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Feil ved lesing av gassmiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Feil ved lesing av detaljer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Hendelse: Venter på bruker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Feil ved import av dykkedata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fikk ikke åpnet %s %s (%s)</translation>
     </message>
@@ -3647,19 +4317,19 @@ Snitt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kunne ikke lese &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Databasespørring get_events feilet.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Databasespørring get_tags feilet.
@@ -3673,36 +4343,36 @@ Snitt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Databasespørring feilet &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Databasespørring get_cylinders feilet.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Databasespørring get_changes feilet.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Databasespørring get_profile_sample feilet.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan ikke åpne stilark %s</translation>
     </message>
@@ -3712,136 +4382,136 @@ Snitt</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Finner ikke gassen %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>For mange gassmikser</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>Advarsel! Dette er en ny implementasjon av Bühlmann-algoritmen, og en dykkeplanlegger som ikke har blitt testet noe særlig.  Vi anbefaler på det sterkeste å ikke planlegge dykk utelukkende med data herfra.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykkeplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>løpetid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>lengde</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gass</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Bytt til gass %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gassforbruk:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Advarsel:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3850,70 +4520,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3922,7 +4592,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3931,262 +4601,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Kalkulert tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Vev %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>puls: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>retning: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dykk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dykk)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>båt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>landdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>strømdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>dypdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>hule</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>isdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>vrakdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>grotte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>høydedykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>basseng</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>innsjø</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>elv</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nattdykk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>ferskvann</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>elev</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instruktør</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4236,97 +4906,97 @@ EADD: %d%s
         <translation>(ingen dykk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>des</translation>
     </message>
@@ -4361,92 +5031,92 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Leser %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>id for oppføring i logg</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>id for dykkesteddata</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>mer data dykke-id</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>våtdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>tørrdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>ermeløs våtdrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>overdel</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>hel drakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>todelt drakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>skalldrakt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Start kommunikasjon</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Klarer ikke å lese fra Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Start nedlasting</translation>
     </message>
@@ -4541,12 +5211,279 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>Alarm: dårlig batteri</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Klarer ikke åpne fila %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Sted</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Vanntemperatur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistikk</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Vurdering</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Sikt</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Drakt</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Emner</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notater</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Årsstatistikk</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>År</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Total tid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min. dybde</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Maks. dybde</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Maks. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min. temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Maks. temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Størrelse</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Vekt</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinater</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Dato:</translation>
@@ -4668,37 +5605,43 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Dropp til første dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Siste stopp ved 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Planlegg stopp med bakgass</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gassvalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC på bunn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>SAC under deko</translation>
     </message>
@@ -4713,27 +5656,33 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>pO₂ for deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Vis løpetid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Vis lengde på segment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Vis overganger i deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Utdypende dykkeplan</translation>
     </message>
@@ -4759,17 +5708,17 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>6m til overflaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 cdaa37089..630c7013e 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -1,6 +1,513 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <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="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation>Kan het backup bestand niet openen: %1</translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation>Instelling bewaard op het toestel</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation>Backup</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation>Serienummer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation>Engels</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation>Duits</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation>Frans</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation>Italiaans</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation>Open Circuit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation>Gesloten Circuit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation>Meter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation>Apnee</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation>MMDDJJ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation>DDMMJJ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation>JJMMDD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation>Gemiddeld</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation>Hoog</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation>2s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation>10s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation>Standaard</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation>Rood</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation>Groen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation>Blauw</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation>Klok duikcomputer met PC synchroniseren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation>%O2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation>%He</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation>Gas 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation>Gas 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation>Gas 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation>Gas 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation>Gas 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation>Dil 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation>Dil 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation>Dil 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation>Dil 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation>Dil 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation>SP 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation>SP 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation>SP 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation>SP 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation>SP 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation>Details duikcomputer opgehaald.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation>Backup duikcomputer instellingen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation>Backup bestanden (*.xml)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation>Fout in XML Backup</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <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="405"/>
+        <source>Backup succeeded</source>
+        <translation>Backup geslaagd</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <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="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation>Instellingen Duikcomputer Herstellen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation>Fout bij het herstellen van XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <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="431"/>
+        <source>Restore succeeded</source>
+        <translation>Herstelling geslaagd</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation>Uw instellingen zijn hersteld.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation>Firmware bestand selecteren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation>Alle bestanden (*.*)</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +550,90 @@
         <translation>Wissel op</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik hier om de fles te verwijderen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Fles kan niet verwijderd worden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden tijdens deze duik kunnen verwijderd worden.</translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation>Component selecteren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation>Welke componenten wilt u kopiëren?</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation>GPS coördinaten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Duikleider</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Zicht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notities</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Gewichten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Flessen</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +656,22 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Toestel ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Apparaatnaam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klik hier om deze duikcomputer te verwijderen.</translation>
     </message>
@@ -122,14 +697,6 @@ duikcomputer wilt verwijderen?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +704,87 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Zoekvak Tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Nieuwe trip hierboven invoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Trip met bovenstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Trip met onderstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>markeer duik(en) als ongeldig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>geselecteerde duiken samenvoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Duik(en) opnieuw nummeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>tijdstippen verschuiven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>afbeeldingen laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +828,13 @@ duikcomputer wilt verwijderen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Geselecteerde duiken</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Alle duiken</translation>
     </message>
@@ -277,11 +844,6 @@ duikcomputer wilt verwijderen?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Logboek bestanden exporteren</translation>
@@ -302,143 +864,148 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Subsurface Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation>Jaarlijkse statistieken uitvoeren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Exporteer enkel lijst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Opmaakstijl opties</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Lettertype grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Thema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Licht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Zandkleurig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV bestanden (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Waarden gescheiden door komma&apos;s met de meest relevante informatie van het duikprofiel.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML bestandsindeling.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Exporteer UDDF bestand als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Exporteer CSV bestand als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Wereldkaart exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML bestanden (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exporteer Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML bestanden (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exporteer HTML bestanden als</translation>
     </message>
@@ -628,42 +1195,42 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Verbruikt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC Instelpunt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Plan verwijderen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>U staat op het punt het plan te verwijderen</translation>
     </message>
@@ -671,17 +1238,17 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Duikplanner punten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Beschikbare gasmengsels</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Duik punt toevoegen</translation>
     </message>
@@ -762,67 +1329,97 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Mins</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation>Gewicht (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation>Gasverbruik (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>US pond</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>Gasverbruik</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp (%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1427,95 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>geen duiken geselecteerd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>kan tijdelijk bestand niet aanmaken: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>interne fout: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>interne fout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Duiklijst wordt opgeladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Duiklijst wordt geladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 duiken worden geladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Download klaar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Beschadigde download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Opladen mislukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Opladen gelukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Login mislukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Kan antwoord niet correct ontleden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Opladen klaar</translation>
     </message>
@@ -948,32 +1545,32 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Uemis duikcomputer zoeken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Log bestanden (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump bestanden (*.bin)</translation>
     </message>
@@ -1037,6 +1634,24 @@ duikcomputer wilt verwijderen?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>libdivecomputer dump opslaan</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation>Ophalen als een nieuwe trip</translation>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <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="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Kan geen verbinding maken met de duikcomputer</translation>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1665,7 @@ duikcomputer wilt verwijderen?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
@@ -1091,27 +1706,27 @@ duikcomputer wilt verwijderen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Duiknotities</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Lucht temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Water temp.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
@@ -1258,67 +1873,61 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Lucht temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Water temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Deze trip wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Meerdere duiken worden bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Deze duik wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Trip notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Trip locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>onbekend</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Diepste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Ondiepste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1936,17 @@ worden uit lucht en:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Wijzigingen niet opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>U staat op het punt wijzigingen te verwijderen</translation>
     </message>
@@ -1345,82 +1954,97 @@ worden uit lucht en:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>pHe grafiek in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Berekening van alle compartimenten in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Door DC aangegeven plafond in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Berekend plafond in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Berekend plafond in 3m stappen in-/uitschakelen</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation>Duik opnieuw plannen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Toon/verberg hartslag</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>MOD in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>SAC in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Meetlat in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Miniatuurafbeeldingen in-/uitschakelen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Details van het duikplan&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2057,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nieuw logboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Logboek &amp;Openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>Bewaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Opslaan als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>GPS gegevens importeren van Subsurface webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation>Kopieer duikcomponenten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation>Plak duikcomponenten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Volgende Duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Wereldbol</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importeren van divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Volledig scherm in-/uitschakelen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Zoek naar updates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>Exporeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Duiklogboek exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Diepteschaal herschalen</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation>Grafiek schalen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation>Toon/verberg foto&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>Afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importeren uit &amp;duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>Hernummeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>pO₂ grafiek in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>pN₂ grafiek in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Apparaatnamen bewerken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Duik toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Automatisch groeperen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Duiklijst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Vorige Duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Handleiding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Duik Plannen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Importeer logbestanden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importeer logboeken uit andere programma&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Runtime tabel afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Jaarlijkse statistieken</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Aanpassingen opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Bestand bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Open duiklogboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Duiklogbestanden (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML bestanden(*.xml);;UDDF/UDCF bestanden(*.uddf *.udcf);;JDiveLog bestanden(*.jlb);;Suunto bestanden(*.sde *.db);;CSV Bestanden(*.csv);;Alle Bestanden(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2508,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Laatste stop op 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% gem. diepte tot 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft tot oppervlakte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% gem. diepte tot 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m tot oppervlakte</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation>cuft/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Standaardinstellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Eenheden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Grafiek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Taal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Lettertype grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Gebruik standaardinstelling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animaties</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Snelheid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Alle instellingen wissen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Zet alle voorkeuren terug naar hun originele waarden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personaliseren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>voet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Systeem standaardinstelling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Authenticatie vereist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Lijsten en tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Standaard duikbestand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Ongeldig scherm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Standaard fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Gebruik standaard fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Standaard gebruikers ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Bewaar gebruikers ID lokaal?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Tijdseenheden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Seconden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow op max diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Allerlei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Stijg-/daalsnelheid noemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Drempelwaarde wanneer pO₂ getoond wordt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Drempelwaarde wanneer pN₂ getoond wordt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Drempelwaarde wanneer pHe getoond wordt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Max pO₂ wanneer MOD getoond wordt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Toon door duikcomputer aangegeven plafond in rood</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Toon niet gebruikte flessen in het Uitrusting tabblad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Toon gemiddelde diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2918,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Herstarten noodzakelijk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Standaard logboek openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
@@ -2333,49 +2965,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Afdrukken</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface kan geen printers vinden op dit systeem!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Duik nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation>Subsurface kan geen bruikbare printers vinden op dit systeem!</translation>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3070,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Duik #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Max diepte: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Duur: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Verbruikt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Trefwoorden:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Gewichten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Nota&apos;s:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Zichtbaarheid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Beoordeling:</translation>
     </message>
@@ -2511,82 +3143,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 van %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Eerste duikcomputer aanmaken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Deze duikcomputer verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Gaswissel toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Bladwijzer toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Gebeurtenis verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Gelijkaardige gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Naam bewerken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Toon alle gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 gebeurtenissen verbergen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Geselecteerde gebeurtenis verwijderen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Naam bladwijzer bewerken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Deze naam is te lang!</translation>
     </message>
@@ -2599,7 +3231,7 @@ p, li { white-space: pre-wrap; }
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Dit punt verwijderen</translation>
     </message>
@@ -2624,72 +3256,85 @@ p, li { white-space: pre-wrap; }
         <translation>Grootste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Ongeldig antwoord van de server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <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="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Kon geen verbinding maken met de duikcomputer.</translation>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3494,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Verbinding wordt opgezet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Download klaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Download fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Verbindingsfout:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Laden succesvol voltooid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Ongeldige gebruikersidentificatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Kan antwoord niet parsen!</translation>
     </message>
@@ -2905,17 +3550,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3596,32 @@ p, li { white-space: pre-wrap; }
         <translation>Controleer uw internetverbinding.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>U gebruikt de laatste nieuwe versie van subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Er is een nieuwe versie van subsurface beschikbaar.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <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="69"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="75"/>
+        <source>Newest release version is </source>
+        <translation>De nieuwste officiele versie is</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3703,85 @@ p, li { white-space: pre-wrap; }
         <translation>De volgende informatie over uw systeem zullen eveneens verzonden worden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Besturingssysteem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Centrale verwerkingseenheid: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Taal: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Mogen we dit later vragen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Niet opnieuw vragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Later vragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Gebruikersenquete verzenden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Opnieuw vragen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Verzend</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Besturingssysteem CPU %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>De volgende fout trad op:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Controleer uw internetverbinding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Gebruikersenquete verzonden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3789,12 @@ Besturingssysteem CPU %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3842,12 @@ Besturingssysteem CPU %1</translation>
         <translation>Uploaden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Operatie duurt te lang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Gegevens worden overgebracht...</translation>
     </message>
@@ -3195,97 +3855,110 @@ Besturingssysteem CPU %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hier klikken om dit gewichtssysteem te verwijderen.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <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="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Kon geen verbinding maken met de duikcomputer.</translation>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jaar
  &gt; Maand / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Duur
  Totaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Kortste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Langste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Diepte (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>Gasverbruik (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3295,87 +3968,86 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) of (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
@@ -3417,229 +4089,229 @@ Maximum</translation>
         <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>geen</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>decompressiestop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>RBT</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>opstijging</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>werklast</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>zender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>schending</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>bladwijzer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>oppervlakte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>veiligheidsstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gaswissel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>veiligheidsstop (vrijwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>veiligheidsstop (verplicht)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>diepe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (veiligheidsstop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>duiktijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>onder de vloer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>resterende luchttijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>RGBM</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>koers</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>waarschuwing stikstofbelasting</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>nultijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Fout bij het registreren van de data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Duik nr. %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Event: wachten op handeling van gebruiker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Fout bij importeren van duikdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fout bij openen van  %s %s (%s)</translation>
     </message>
@@ -3651,19 +4323,19 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Database-query get_events mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Database query get_tags mislukt.
@@ -3677,36 +4349,36 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database-query mislukt: &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Database query get_cylinders mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Database query get_changes mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Database query get_profile_sample mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan de stylesheet %s niet openen</translation>
     </message>
@@ -3716,136 +4388,136 @@ Maximum</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Gas %s kan niet gevonden worden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Teveel gasmengsels</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface duikplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>diepte</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>duur</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Gaswissel naar %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Waarschuwing:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3854,70 +4526,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3926,7 +4598,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3935,262 +4607,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Veiligheidsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Veiligheidsstop: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berekend plafond %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Compartiment %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>hartslag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>koers: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 duiken)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 duik)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>boot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>kust</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>diep</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>spelonk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>ijs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>wrak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>grot</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>hoogte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>zwembad</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>meer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>rivier</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nacht</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>zoet</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instructeur</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>decompressie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4240,97 +4912,97 @@ EADD: %d%s
         <translation>(geen duiken)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -4365,92 +5037,92 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Lezen %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>gegevens</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>Duiklog gegeven ID</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>Duiklocatie data ID</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation>duiklog #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>meer data voor duik ID</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation>duiklocatie #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation>details voor #</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>natpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semidroog</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>droogpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>jack</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>tweedelig pak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2-delig pak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membraan droogpak</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Initialiseer communicatie</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis niet geïnitialiseerd</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Begin download</translation>
     </message>
@@ -4545,12 +5217,279 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>Alarm: Lege batterij</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan het bestand %s niet openen</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation>Nummer</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Luchttemp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Watertemp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation>duiken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation>Alles uitklappen</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation>Alles inklappen</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation>trips</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistieken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation>Geavanceerd Zoeken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Zicht</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notities</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation>Toon meer details</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Jaarlijkse statistieken</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Jaar</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Totale tijd</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation>Gemiddelde Tijd</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation>Kortste Tijd</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation>Langste Tijd</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation>Gemiddelde Diepte</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min. diepte</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max. diepte</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation>Gemiddeld gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min. gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max. gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation>Gemiddelde Temperatuur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min. temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max. temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation>Terugkeren naar de lijst</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation>Duik nr.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation>Duikprofiel</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation>Duikinformatie</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation>Duikuitrusting</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Grootte</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation>Werkdruk</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation>Startdruk</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation>Einddruk</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation>Gebeurtenissen</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation>Waarde</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coördinaten</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation>Duikstatus</translation>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -4672,37 +5611,43 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Afdalen tot eerste dieptetrap</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Plan backgas pauzes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gas opties</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Gasverbruik (bodem)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Gasverbruik (deco)</translation>
     </message>
@@ -4717,27 +5662,33 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Duiknotities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Runtime tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Duur van het segment tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Toon overgangen in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Verbatim duikplan</translation>
     </message>
@@ -4763,17 +5714,17 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>6m tot oppervlakte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 aa2410e68..503b5a19c 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Rodzaj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Zmiana na</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknięcie tu usunie butlę z listy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Butla nie może być usunięta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Widzialność</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Opis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Balast</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Butle</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID urządzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Kliknięcie tu usunie ten komputer nurkowy.</translation>
     </message>
@@ -122,14 +695,6 @@ wybrany komputer nurkowy?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ wybrany komputer nurkowy?</translation>
         <translation>Pokaż okno wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Zwiń pozostałe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Usuń nurkowanie(a) z grupy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Utwórz nową grupę powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Usuń nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Oznacz nurkowanie(a) jak niepoprawne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Połącz wybrane nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Zmień czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Dodaj zdjęcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Dodawanie zdjęć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ wybrany komputer nurkowy?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Wybrane nurkowania</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Wszystkie nurkowania</translation>
     </message>
@@ -277,11 +842,6 @@ wybrany komputer nurkowy?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimalny Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Eksportowanie nurkowań</translation>
@@ -302,143 +862,148 @@ wybrany komputer nurkowy?</translation>
         <translation>Zachowaj numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Eksportuj tylko listę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Ustawienia stylu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Światło</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Piasek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>pliki CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Lista oddzielonych przecinkami najważniejszych informacji z profilu nurkowania. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML używany przez Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Eksportuj plik UDDF jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Eksportuj plik CSV jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Eksport mapy świata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>Pliki HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Eksport Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Pliki XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Eksportuj pliki HTML jako</translation>
     </message>
@@ -628,42 +1193,42 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Głębokość końcowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Używany gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Porzucić plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Masz zamiar porzucić plan</translation>
     </message>
@@ -671,17 +1236,17 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Plan nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>dodaj punkt do profilu</translation>
     </message>
@@ -762,67 +1327,97 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Czas</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Czas trwania</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>nie wybrano żadnych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>błąd wewnętrzny: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>błąd wewnętrzny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Zakończ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Wysyłanie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Pobieranie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Pobieranie %1 nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Zakończono pobieranie - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Pobrano uskodzone dane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Wysyłanie nieudane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Wysyłanie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Błąd logowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Nie można przetworzyć odpowiedzi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Błąd: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Wysyłanie zakończone</translation>
     </message>
@@ -948,32 +1543,32 @@ wybrany komputer nurkowy?</translation>
         <translation>Wykryj komputer Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Pliki logów (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Pliki binarne (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ wybrany komputer nurkowy?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Zapisz zrzut danych libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ wybrany komputer nurkowy?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
@@ -1091,27 +1704,27 @@ wybrany komputer nurkowy?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Temp. powietrza</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Temp. wody</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
@@ -1259,67 +1872,61 @@ wybrany komputer nurkowy?</translation>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. powietrza [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. wody [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Ta grupa nurkowań jest obecnie edytowana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Kilka nurkowań jest obecnie edytowanych.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>To nurkowanie jest obecnie edytowane.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Opis nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Miejsce nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>nieznana</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Najgłębsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Najpłytsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1328,17 +1935,17 @@ z powietrza przy użyciu:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>oraz </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Porzucić zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Masz zamiar porzucić zmiany.</translation>
     </message>
@@ -1346,82 +1953,97 @@ z powietrza przy użyciu:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Pokazuj wykres pHe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Obliczenia dla wszystkich tkanek</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Pokazuj sufit z komputera nurkowego</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Pokazuj obliczony sufit</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Pokazuj NDL / TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Pokazuj obliczony sufit z krokiem 3m</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Pokazuj tętno</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Pokazuj MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Pokazuj EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Pokazuj SAC</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Pokazuj linijkę</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Pokazuj miniaturki zdjęć</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Plan nurkowy&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1434,454 +2056,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>Nowy logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Otwórz logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importuj dane GPS z usługi sieciowej Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Wszystko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Następny komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importuj z divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Pełen ekran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Przełącz pełen ekran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Sprawdź aktualizacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>Eksport</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Eksport Nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Skalowanie osi głebokości</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importuj z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Pokazuj wykres pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Pokazuj wykres pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Edycja nazw komputerów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Dodaj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Automatycznie grupuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Lista nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Poprzedni komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>W lewo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>W prawo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Zaplanuj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Importowanie logów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importuj logi z innej aplikacji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Drukowanie planu nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Statystyka roczna</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Zapisać zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Otwórz plik z logiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Logi nurkowe (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Pliki XML (*.xml);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki JDiveLog (*.jlb);;Pliki Suunto(*.sde *.db);;Pliki CSV(*.csv);;Wszystkie pliki(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1889,380 +2507,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Ostatni przystanek na gł. 20 stóp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <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="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <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="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m do powierzchni</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Jednostki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Wykres</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Sieć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Używaj domyślnego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Prędkość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Kasowanie ustawień</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Przywróć wszystkie ustawienia do ich wartości domyślnych </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metryczny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperialny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Dostosuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>stopy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>stopy sześcienne (cu ft)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>stopnie Celsjusza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>stopnie Fahrenheita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Domyślne ustawienia systemu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Rodzaj proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Wymaga autentykacji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listy i tabele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Domyślny plik nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Pokazuj niepoprawne nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Domyślna butla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Użyj domyślnej butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Usługa Internetowa Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Domyślne ID Użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Zapisywać ID użytkownika do pliku?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Objętość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Jednostki czasu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow na maksymalnej głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Mianownik szybkości zanurzania/wynurzania </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Próg ostrzeżenia dla  pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Próg ostrzeżenia dla  pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Próg ostrzeżenia dla  pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Max ppO₂ gdy wyświetlany jest MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Pokazuj głębokość średnią</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2287,32 +2917,32 @@ p, li { white-space: pre-wrap; }
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Wymagane ponowne uruchomienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Otwórz domyślny plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
@@ -2334,49 +2964,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Drukuj</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface nie może znaleźć zainstalowanych drukarek!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2439,72 +3069,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Nurkownie #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Max głębokość: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Czas: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Użyty gaz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Tagi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Balast:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Widzialność:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Ocena:</translation>
     </message>
@@ -2512,82 +3142,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Ustaw jako pierwszy komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Usuń ten komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Dodaj zmianę gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Dodaj notatkę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Usuń znacznik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Ukryj podobne znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Odkryj wszystkie znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Ukrywanie wydarzeń</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Ukyć wszystkie wydarzenia typu %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Usunąć wybrane wydarzenie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Zmień nazwę wydarzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Własna nazwa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Nazwa jest za długa!</translation>
     </message>
@@ -2600,7 +3230,7 @@ p, li { white-space: pre-wrap; }
         <translation>POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Usuń ten punkt</translation>
     </message>
@@ -2625,72 +3255,85 @@ p, li { white-space: pre-wrap; }
         <translation>max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Niepoprawna odpowiedź z serwera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Uszkodzona odpowiedź XML. Linia  %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2850,47 +3493,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Usługa Internetowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Pobieranie zakończone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Błąd pobierania: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Błąd połączenia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Pobieranie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Niepoprawny identyfikator użytkownika!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Nie można przetworzyć odpowiedzi!</translation>
     </message>
@@ -2906,17 +3549,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2952,22 +3595,32 @@ p, li { white-space: pre-wrap; }
         <translation>Sprawdź proszę swoje połączenie z Internetem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <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="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Nowsza wersja Subsurface jest dostępna.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Wystapił błąd podczas sprawdzania dostępności aktualizaji.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -3049,80 +3702,85 @@ p, li { white-space: pre-wrap; }
         <translation>Zostaną dołączone także następujące informacje o Twoim systemie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 System Operacyjny: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Architektura CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Język: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Czy powinniśmy zapytać Cię ponownie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Nie pytajcie mnie ponownie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Zapytaj później</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Wysyłanie ankiety.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Zapytać ponownie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Wyślij</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Architektura OS CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Natrafiono na następujący błąd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Ankieta pomyślnie wysłana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Wystapił błąd podczas sprawdzania dostępności aktualizaji.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -3130,12 +3788,12 @@ Architektura OS CPU: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3183,12 +3841,12 @@ Architektura OS CPU: %1</translation>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Przekroczony czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Przesyłanie danych...</translation>
     </message>
@@ -3196,92 +3854,105 @@ Architektura OS CPU: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Kliknięcie tu usunie balast z listy.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Miesiąc / grupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Czas trwania
 całkowity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>najkrótszy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>najdłuższy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Głębokość (%1)
  średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>minimalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -3291,87 +3962,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
@@ -3413,229 +4083,229 @@ Maximum</source>
         <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>brak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>przystanek deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>pozostały czas denny</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>wynurzanie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>sufit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>wysiłek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>nadajnik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>naruszenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>notatka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>powierzchnia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>przystanek bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>zmiana gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>przystanek bezpieczeństwa (opcjonalny)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>przystanek bezpieczeństwa (obowiązkowy)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>sufit (przystanek bezpieczeństwa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>poniżej podłogi deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Max głębokość</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>Pozostały czas oddychania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>kierunek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Ostrzeżenie: poziom nasycenia tkanek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>czas bezdekompresyjny</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>niepoprawny znacznik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Nurkowanie %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <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="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie udało się otworzyć %s %s (%s)</translation>
     </message>
@@ -3647,19 +4317,19 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Zapytanie bazy danych  get_events nie powiodło się.⏎
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Zapytanie bazy danych get_tags nie powiodło się.
@@ -3673,36 +4343,36 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Zapytanie bazy danych get_cylinders nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Zapytanie bazy danych get_changes nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Zapytanie bazy danych get_profile_sample nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nie można otworzyć arkusza stylów %s</translation>
     </message>
@@ -3712,136 +4382,136 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Nie można znaleźć gazu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Zbyt wiele rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Plan nurkowania Subsurface </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>głębokość</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>czas trwania</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Zmiana gazu na %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Zużycie gazu:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Ostrzeżenie:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3850,70 +4520,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3922,7 +4592,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3931,35 +4601,35 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Przystanek bezp.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Przystanek bezp.: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>dekompresja
@@ -3967,227 +4637,227 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>dekompresja (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Obliczony sufit:  %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tkanka %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>tętno: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 nurkowanie)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>z łodzi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>z brzegu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>dryf</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>głębokie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>kawerna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>podlodowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>wrakowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>jaskiniowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>wysokość</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>basen</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>jezioro</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>rzeka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nocne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>słodka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>uczeń</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>fotografia</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4237,97 +4907,97 @@ EADD: %d%s
         <translation>(brak nurkowań)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
@@ -4362,92 +5032,92 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Czytanie %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>dane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>wpis dziennika nurkowego id</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>dane o miejscu nurkowania</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>dane nurkowania id</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>mokry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>półsuchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>suchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>krótki</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>kamizelka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>długi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>kurtka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>pełna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>pełna dwuczęściowa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membranowy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Nawiązywanie łączności</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Błąd inicjalizacji Uemis </translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Rozpocznij pobieranie</translation>
     </message>
@@ -4542,12 +5212,279 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>Alarm: niski poziom baterii</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nie można otworzyć pliku %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Temp. powietrza</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Temp. wody</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statystyka</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Widzialność</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Czas trwania</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Opis</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Statystyka roczna</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Rok</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Całkowity czas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min głębokość </translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max głębokość </translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Rodzaj</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Pojemność</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Balast</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Współrzędne</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -4669,37 +5606,43 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Spadnij do pierwszej głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Przerwy powietrzne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Ustawienia gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC przy dnie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
@@ -4714,27 +5657,33 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>pO₂ podczas deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Pokazuj runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Pokazuj czas trwania segmentu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Pokazuj przejścia między przystankami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Plan opisowy</translation>
     </message>
@@ -4760,17 +5709,17 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>6m do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 f4d8a7998..50c1e5830 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Trocar aos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar este cilindro.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cilindro não pode ser eliminado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Roupa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Parceiro</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Rótulos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Lastro</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Cilindros</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Clicar aqui removerá os computadores de mergulho</translation>
     </message>
@@ -122,14 +695,6 @@ o computador de mergulho selecionado?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ o computador de mergulho selecionado?</translation>
         <translation>Mostrar tela de busca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Esconder todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Esconder outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remover mergulhos de viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Criar viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Juntar viagem com viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Juntar viagem com viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Apagar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar megulho(s) como inválidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Juntar mergulhos selecionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Deslocar tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Carregar imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Abrir imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ o computador de mergulho selecionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Mergulhos selecionados</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Todos os mergulhos</translation>
     </message>
@@ -277,11 +842,6 @@ o computador de mergulho selecionado?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Javascript Minimo</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exportar arquivo de log</translation>
@@ -302,143 +862,148 @@ o computador de mergulho selecionado?</translation>
         <translation>Numeros do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Exportar apenas a lista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Opções de estilo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Leve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Areia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Arquivos UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Arquivos CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Arquivo de texto separado por virgulas que incluem as informações mais relevantes do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato nativo do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Exportar arquivo UDDF como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Exportar arquivo CSV como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Exportar mapa do mundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>Arquivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar XML do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Arquivos XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exportar arquivo HTML como</translation>
     </message>
@@ -628,42 +1193,42 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>ponto CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Descartar o plano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Você está prestes a eliminar seu planejamento.</translation>
     </message>
@@ -671,17 +1236,17 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Pontos planejados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Gases disponiveis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Adicionar ponto</translation>
     </message>
@@ -762,67 +1327,97 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Mins</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>CNS Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>nenhum mergulho selecionado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>erro interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Finalizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Enviando lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Recebendo lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Recebendo %1 mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Recebimento terminado - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Recebimento inválido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Envio falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Envio bem sucedido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Abertura de sessão (login) falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Falha na análise da resposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Enviado finalizado</translation>
     </message>
@@ -948,32 +1543,32 @@ o computador de mergulho selecionado?</translation>
         <translation>Encontrar computador de mergulho Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Arquivos de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Arquivos de saída (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ o computador de mergulho selecionado?</translation>
         <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"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ o computador de mergulho selecionado?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -1091,27 +1704,27 @@ o computador de mergulho selecionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Temperatura do ar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -1258,67 +1871,61 @@ o computador de mergulho selecionado?</translation>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Temperatura do Ar [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Temperatura da água [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Esta viagem está sendo editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <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="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Este mergulho está sendo editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Notas da viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Local do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Mergulho mais profundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Mergulho mais raso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ misturados com ar usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Descartar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Você está prestes a eliminar suas alterações.</translation>
     </message>
@@ -1345,82 +1952,97 @@ misturados com ar usando:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>A&amp;rquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Alterna gráfico pHe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Alterna calcular todos os tecidos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Alterna teto calculado pelo computador</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Alterna teto calculado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Alterna NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Alterna teto calculado com incrementos de 3m</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Alterna batimentos cardiacos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>alterna MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Alterna EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>alterna taxa SAC</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Anternar visualização da régua</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Alterna visualização de fotos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detalhes do planejamento&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Sal&amp;var como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Salvar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Fe&amp;char</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>P&amp;referencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importar dados de &amp;GPS pelo web service do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Informações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>Próximo Computador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importar de &amp;divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;F Tela Cheia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Alternar em Tela Cheia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Checar por updates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exportar mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Redimensionar a régua de profundidade</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>%Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Alterna gráfico de pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Alterna gráfico de pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Editar nomes dos dispositivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Adicionar mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Auto a&amp;grupar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Estatisticas Anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Lista de Mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Computador de mergulho anterior</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Planejador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Importar arquivos de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importar arquivos de mergulho de outros programas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabela</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Estatisticas Anuais</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Salvar Alteraḉões?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Salvar arquivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Arquivos de mergulho  (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);; Arquivos XML (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog (*.jlb);;Suunto Files(*.sde *.db);;CSV (*.csv);;Todos os arquivos(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>pés/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Ultima parada em 20 pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Ultima parada em 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Padrões</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Gráfico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Língua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Velocidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Apagar todas as preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Voltar aos padrões</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>pé cúbico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Tipo de Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Requer Autenticação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Nome de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Unidades de tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Reinicialização necessária</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Mergulho nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Profundidade máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Tags:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Roupa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 de %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Marcar como primeiro computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Apagar este computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Editar nome</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Mostrar todos os eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Esconder todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento selecionado?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Editar nome do favorito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Apelido:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Resposta inválida do servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Resposta XML defeituosa. Linha %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Recebimento finalizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Erro no recebimento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Identificador de usuário inválido!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Não é possível analisar a resposta!</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>Por favor, verifique sua conexão a internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Você está usando a ultima versão do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Uma nova versão do subsurface está disponivel, &lt;br/&gt;Clique em: &lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para fazer o download.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Uma nova versão do subsurface está disponivel.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,79 +3701,84 @@ p, li { white-space: pre-wrap; }
         <translation>As seguintes informações sobre seu sistema também serão enviadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Sistema Operacional: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Arquitetura do Processador: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Lingua: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Perguntar depois?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Perguntar depois?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>O seguinte erro ocorreu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Pesquisa enviada com sucesso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3128,12 +3786,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3181,12 +3839,12 @@ OS CPU Architecture: %1</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Tempo limite para operação estourou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Transferindo dados...</translation>
     </message>
@@ -3194,97 +3852,110 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt; Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Médio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3294,87 +3965,86 @@ Médio</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>pés/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>pés/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
@@ -3416,229 +4086,229 @@ Médio</translation>
         <translation>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>nenhum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>parada de deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>subida</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>teto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>nível de esforço</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>transmissor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>violação</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>favorito</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>parada de segurança</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>troca de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>parada profunda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>teto (parada de segurança)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>abaixo da zona de descompressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>prof máx</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>tempo de ar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>direção</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Alarme do nível nos tecidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>tempo sem parada</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Erro no registo dos dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/horário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise da duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <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="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <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="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: aguardando ação do usuário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do rótulo do evento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do rótulo de cancelamento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Erro ao importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto da libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
@@ -3651,19 +4321,19 @@ Médio</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>A consulta &quot;get_events&quot; falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Pesquisa no banco de dados falhou no get_tags
@@ -3677,36 +4347,36 @@ Médio</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Pesquisa no banco de dados falhou no get_cylinders
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Pesquisa no banco de dados falhou no get_changes
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Pesquisa no banco de dados falhou no get_profile_sample
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Falha na abertura da folha de estilo %s</translation>
     </message>
@@ -3716,136 +4386,136 @@ Médio</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Não é possivel achar gas o %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Misturas de gás em excesso</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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: Utilizamos uma nova implementação do algoritimo de Buhlmann, e um planejador que recebeu um tempo limitado de testes. Recomendamos não planejar mergulhos apenas nos resultados obtidos aqui.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Plano de mergulho do subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>profundidade</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>tempo</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Trocar o gás por %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3854,70 +4524,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3926,7 +4596,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3935,260 +4605,260 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de segurança:  %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>Em deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Em deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Teto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tecido %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>Cardio: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>barco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>costa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>correnteza</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>profundo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>gruta (com luz natural)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>gelo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>naufrágio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>rio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>noturno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>água doce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>aluno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>vídeo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instrutor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4238,97 +4908,97 @@ EADD: %d%s
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -4363,92 +5033,92 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Lendo %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>dados</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>identificador de registro no diário de mergulho</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>identificação dos dados do local de mergulho</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>mais informações sobre identificador de mergulho</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>roupa úmida</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semi-seca</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>roupa seca</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>short</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>casaco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>macacão</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>colete</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>roupa completa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>Roupa completa 2 peças</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Iniciar Comunicação</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Iniciar recebimento</translation>
     </message>
@@ -4543,12 +5213,279 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation>Alerta de nível de bateria baixo</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Não é possivel abrir o arquivo %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Horário</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Temperatura do Ar</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Estatísticas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Parceiro</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Roupa</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Rótulos</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Estatisticas Anuais</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Ano</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Tempo total</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Profundidade mínima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Temperatura Mínima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Tamanho</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -4670,37 +5607,43 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation>GF baixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Descer até o primeiro ponto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Ultima parada em 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC no fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
@@ -4715,27 +5658,33 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4761,17 +5710,17 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 e060bd847..10e41d155 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Mudar aos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar esta garrafa.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>A garrafa não pode ser eliminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Fato</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Guia de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Companheiros</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Lastro</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Garrafas</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
@@ -122,14 +695,6 @@ remover o computador de mergulho seleccionado?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Mostrar janela de pesquisa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Colapsar outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Criar uma nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Juntar os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Alterar tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Carregar imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Abrir ficheiros de imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ remover o computador de mergulho seleccionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Mergulhos seleccionados</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Todos os mergulhos</translation>
     </message>
@@ -277,11 +842,6 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Javascript mínimo</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exportar ficheiros de registos de mergulho</translation>
@@ -302,143 +862,148 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Números do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Exportar apenas a lista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Opções de estilo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Leve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Areia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Ficheiros CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Valores separados por vírgulas que incluem a informação mais relevante do perfil de mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Exportar ficheiro UDDF como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Exportar ficheiro CSV como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Exportar mapa mundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>Ficheiros HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar XML do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Ficheiros XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exportar ficheiros HTML como</translation>
     </message>
@@ -628,42 +1193,42 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Eliminar o plano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Está prestes a eliminar o plano.</translation>
     </message>
@@ -671,17 +1236,17 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Pontos do plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Gases disponíveis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Adicionar ponto ao mergulho</translation>
     </message>
@@ -762,67 +1327,97 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Min</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>CNS Máx</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>libras</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>Consumo</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>libras</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>não foram seleccionados nenhuns mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>erro interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Concluído</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>A carregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>A descarregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>A descarregar %1 mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Descarga terminada - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>A exportação falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Exportação bem sucedida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>O login falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Não foi possível analisar a resposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Carregamento terminado</translation>
     </message>
@@ -948,32 +1543,32 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Procurar computador de mergulho Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Ficheiros log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Ficheiros dump (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ remover o computador de mergulho seleccionado?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Gravar ficheiro em bruto do libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ remover o computador de mergulho seleccionado?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -1091,27 +1704,27 @@ remover o computador de mergulho seleccionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Temp. do ar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Temp. da água</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -1258,67 +1871,61 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. do ar [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. da água [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Esta viagem está a ser editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <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="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Este mergulho está a ser editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Local da viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Mergulho mais fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Mergulho menos fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ obtidos a partir do ar usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Eliminar as alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Está prestes a eliminar as alterações.</translation>
     </message>
@@ -1345,82 +1952,97 @@ obtidos a partir do ar usando:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Mostrar/ocultar gráfico de pHe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Mostrar/ocultar cálculo para todos os tecidos</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Mostrar/ocultar o tecto indicado pelo computador de mergulho</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Mostrar/ocultar o tecto calculado</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Mostrar/ocultar NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Mostrar/ocultar tecto calculado com intervalos de 3 m</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Mostrar/ocultar ritmo cardíaco</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Mostrar/ocultar MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Mostrar/ocultar EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Mostrar/ocultar taxa de consumo</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Mostrar/ocultar régua</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Mostrar/ocultar visualização das miniaturas das imagens</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detalhes do plano de mergulho&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>G&amp;ravar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>P&amp;referências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importar dados de &amp;GPS a partir do serviço Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Informações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Todas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Próximo computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Acerca do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importar &amp;de Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Ecrã completo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Ligar/desligar ecrã completo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Procurar actualizações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exportar registos de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Alterar a escala do eixo da profundidade</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Mostrar/ocultar gráfico da pO₂ </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Mostrar/ocultar gráfico da pN₂ </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Editar nomes dos computadores de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Adicionar mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Agrupar &amp;automaticamente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Lista de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Computador de mergulho &amp;anterior</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>&amp;Manual do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lanear mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importar ficheiros de registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importar logbooks de outros programas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabela de runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Estatísticas anuais</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Guardar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Guardar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Abrir ficheiro de registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Ficheiros de registo de mergulhos (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;Ficheiros XML (*.xml);;Ficheiros UDDF/UDCF(*.uddf *.udcf);;Ficheiros do JDiveLog (*.jlb);;Ficheiros Suunto(*.sde *.db);;Ficheiros CSV(*.csv);;Todos os fiicheiros(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Última paragem aos 20 ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <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="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>6 m/20 ft para a superfície</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <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="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6 m para a superfície</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Definições padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Gráfico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Língua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Use o padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Velocidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Limpar todas as definições</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Restaurar todas as definições para o seu valor padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Linguagem do sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Tipo de proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Requer autenticação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Nome de utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Palavra-passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listas e tabelas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Ficheiro de mergulho por defeito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Mostrar inválidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Garrafa padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Usar a garrafa padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Serviço web do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>ID do utilizador por defeito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Gravar a ID do utilizador localmente?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Unidades de tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Denominador para a velocidades de subida/descida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Limite quando mostrar pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Limite quando mostrar pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Limite quando mostrar pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>pO₂ Max quando mostrar MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Desenhar a vermelho o tecto calculado  pelo computador de mergulho </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Mostrar garrafas não usadas na tab do equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Mostrar profundidade média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>É necessário reiniciar a aplicação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Não foram encontradas impressoras instaladas neste computador!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Prof. Máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Etiquetas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Tornar como primeiro computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Eliminar este computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Adicionar mudança de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Adicionar marcador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Remover evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Editar nome</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Mostrar todos os eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Ocultar todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento seleccionado?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Editar nome do marcador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Nome personalizado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>O nome é demasiado comprido!</translation>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Remover este ponto</translation>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>pé cúbico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Resposta inválida do servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Resposta XML mal formada. Linha %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>A ligar ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Descarga terminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Erro na descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Erro de ligação:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Transferência bem sucedida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Identificação de utilizador inválida !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Não foi possível analisar a resposta !</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>Por favor, verifique a ligação à Internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Está a usar a versão mais recente do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Está disponível uma nova versão do Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3701,85 @@ p, li { white-space: pre-wrap; }
         <translation>Será igualmente submetida a seguinte informação sobre o seu sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Sistema operativo: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Arquitectura do CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Linguagem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Deveríamos perguntar-lhe mais tarde?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <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="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Perguntar mais tarde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Enviar questionário do utilizador.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Perguntar novamente?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Arquitectura do CPU e SO: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Ocorreu o seguinte erro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Questionário enviado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3787,12 @@ Arquitectura do CPU e SO: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3840,12 @@ Arquitectura do CPU e SO: %1</translation>
         <translation>Carregar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>A operação demorou demasiado tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>A transferir dados...</translation>
     </message>
@@ -3195,97 +3853,110 @@ Arquitectura do CPU e SO: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Ao clicar aqui irá remover este sistema de lastro</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt;Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>Consumo (%1)
 Médio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -3295,87 +3966,86 @@ Média</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
@@ -3417,229 +4087,229 @@ Média</translation>
         <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>nenhum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>paragem de deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>subida</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>tecto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>esforço</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>transmissor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>transgressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>paragem de segurança</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>troca de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>paragem de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>paragem de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>paragem funda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>tecto (paragem de segurança)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>abaixo da zona de descompressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>autonomia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>cabeçalho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>Alarme de tensão de azoto nos tecidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>tempo sem paragem</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>Número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Erro no registo de dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <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="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Erro a importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
@@ -3652,19 +4322,19 @@ Média</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>A consulta &quot;obter eventos&quot; falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Falha no query get_tags à base de dados.
@@ -3678,36 +4348,36 @@ Média</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Falha na obtenção do query get_cylinders da base de dados.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Falha na obtenção do query get_changes na base de dados.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Falha na obtenção do query get_profile_sample da base de dados.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Não é possível abrir a folha de estilos %s</translation>
     </message>
@@ -3717,136 +4387,136 @@ Média</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <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="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas misturas de gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>AVISO:ESTA É UMA IMPLEMENTAÇÃO DO ALGORITMO BUEHLMANN PARA PLANIFICAR MERGULHOS. CONTUDO ESTE PLANIFICADOR SÓ FOI TESTADO DE FORMA LIMITADA. RECOMENDAMOS QUE NÃO SE BASEIE UNICAMENTE NOS RESULTADOS OBTIDOS AQUI PARA PLANEAR OS SEUS MERGULHOS.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Plano de mergulho Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>profundidade</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Mudar para %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gás:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3855,70 +4525,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3928,7 +4598,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3938,49 +4608,49 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Paragem de segurança: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Paragem de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Descompressão: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Descompressão: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>Em descompressão
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
@@ -3988,213 +4658,213 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Descompressão:  %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>Em descompressão (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Tecto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tecido  %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>frequência cardíaca: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>enfiamento: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>barco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>costa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>à deriva</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>profundo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>gelo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>naufrágio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>gruta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>em altitude</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>rio</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nocturno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>água doce</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>aluno</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>vídeo</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instrutor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>descompressão</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4244,97 +4914,97 @@ EADD: %d%s
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -4369,92 +5039,92 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>A ler %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>dados</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>identificador no diário de mergulho</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>identificação do local de mergulho</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>mais dados do identificador de mergulho</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>fato húmido</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>fato semi-seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>fato seco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>short</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>casaco</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>colete</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>fato completo</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>Fato completo de 2 peças</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Iniciar Comunicação</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Começar transferência</translation>
     </message>
@@ -4549,12 +5219,279 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>Alerta de Bateria Baixa</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Não é possível abrir o ficheiro %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Tempo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Temperatura do ar</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Temp. de Água</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Estatísticas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Companheiros</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Fato</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Estatísticas anuais</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Ano</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Tempo total</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Profundidad mínima</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Profundidade máx</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Mín SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Máx SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Mín Temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Máx. Temp.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Capacidade</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -4676,37 +5613,43 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Descer para a primeira profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Planear intervalos na mistura de fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Opções de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Consumo no fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Consumo durante a descompressão</translation>
     </message>
@@ -4721,27 +5664,33 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>pO₂ na descompressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Mostrar runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Mostrar duração dos segmentos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Mostrar transições na descompressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Plano de mergulho detalhado</translation>
     </message>
@@ -4767,17 +5716,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="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 957104a1e..e6500cbf7 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Anulează</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tip</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Schimbă la</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Făcând click aici veți înlătura acest tub.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tubul nu poate fi înlăturat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Locație</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Costum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Maestru scufundare</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Companion</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Vizibilitate</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Greutăți</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Tub</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID-ul dispozitivului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -122,14 +695,6 @@ computerul de scufundări selectat?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ computerul de scufundări selectat?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -261,13 +826,13 @@ computerul de scufundări selectat?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation type="unfinished"/>
     </message>
@@ -277,11 +842,6 @@ computerul de scufundări selectat?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation type="unfinished"/>
@@ -302,143 +862,148 @@ computerul de scufundări selectat?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Mărimea fontului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Fișiere UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
@@ -628,42 +1193,42 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Sunteți pe cale de a șterge planul.</translation>
     </message>
@@ -671,17 +1236,17 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
@@ -762,67 +1327,97 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Locație</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>livre</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>nu a fost selectată nicio scufundare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>eroare internă</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Finalizat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Se uploadează lista de scufundări...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Se descarcă lista de scufundări...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Descărcarea s-a terminat - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Descărcarea a fost coruptă.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Upload-ul a eșuat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Upload-ul a avut succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Logarea a eșuat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Nu s-a putut parsa răspunsul</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Eroare: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Upload-ul a fost finalizat</translation>
     </message>
@@ -948,32 +1543,32 @@ computerul de scufundări selectat?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Fișiere de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Fișiere dump (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ computerul de scufundări selectat?</translation>
         <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"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ computerul de scufundări selectat?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Locație</translation>
     </message>
@@ -1091,27 +1704,27 @@ computerul de scufundări selectat?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notițe</translation>
     </message>
@@ -1258,84 +1871,78 @@ computerul de scufundări selectat?</translation>
         <translation>Anulează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Această scufundare este editată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>necunoscut</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1343,82 +1950,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Fișier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Printează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1427,454 +2049,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajutor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Importați</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Jurnal nou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Nou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Deschide jurnal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Deschide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Salvează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Salvează ca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Închide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Închide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Printează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importă din computerul de &amp;scufundări</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctr++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerotează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Stânga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Dreapta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1882,380 +2500,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Implicite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Unități</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Grafic</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Limba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Mărimea fontului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Scufundări</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metric</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalizați</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtrează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Presiune</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Unități de timp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minute</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Secunde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Arată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow la adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Diverse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Preferințe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2280,32 +2910,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Este necesară o repornire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
@@ -2327,49 +2957,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Printează</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Scufundarea nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Maestru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Companion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Locația</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2432,72 +3062,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Scufundarea  #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Adâncimea maximă: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>GreutățiȘ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Maestru scufundare:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Companion:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Costum:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Rating:</translation>
     </message>
@@ -2505,82 +3135,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Șterge evenimente similare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Arată toate evenimentele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Ascunde evenimente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Ascunde toate %1 evenimentele?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Înlătură evenimentul selectat?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2593,7 +3223,7 @@ p, li { white-space: pre-wrap; }
         <translation>AER</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2618,72 +3248,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maxim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Răspuns invalid de la server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2843,47 +3486,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Serviciu Web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Se conectează...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>S-a terminat descărcarea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Identificator de utilizator invalid!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Nu se poate parsa răspunsul!</translation>
     </message>
@@ -2899,17 +3542,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Descriere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2945,22 +3588,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3042,76 +3695,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Trimitere</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3119,12 +3777,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Descriere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3172,12 +3830,12 @@ OS CPU Architecture: %1</source>
         <translation>Uploadează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Se transferă datele...</translation>
     </message>
@@ -3185,97 +3843,110 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>An
 &gt; Luna / Excursie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Durată
 Totală</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Cel mai scurt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Cel mai lung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Adâncime (%1)
 Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maxim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Mediu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3285,87 +3956,86 @@ Medie</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) sau (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>aer</translation>
     </message>
@@ -3407,229 +4077,229 @@ Medie</translation>
         <translation>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>niciunul</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>oprire de decompresie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>ascensiune</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>plafon</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>volum de muncă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>transmițător</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>încălcare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>semn de carte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>suprafață</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>oprire pentru siguranță</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>schimbarea gazului</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>oprire pentru siguranță (voluntară)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>oprire pentru siguranță (obligatorie)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>plafon (oprire pentru siguranță)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>timp scufundare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>adâncime maximă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>timp aer rămas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>direcție</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>avertizare nivel țesut</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>timp fără oprire</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>numărul evenimentul este invalid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Eroare înregistrând datele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Scufundarea %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Eroare parsând adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Eroare parsând valoarea amestecului de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Eroare obținând salinitatea apei</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Eroare obținând presiunea la suprafață</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Eroare parsând amestecul de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Eroare parsând eșantioanele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Eveniment: aștept acțiunea utilizatorului</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Eroare la înregistrarea handlerului de evenimente.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Eroare la înregistrarea handlerului de anulare.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Eroare la importarea datelor despre scufundare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nu s-a putut crea contextul libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nu s-a putut deschide %s %s (%s)</translation>
     </message>
@@ -3641,19 +4311,19 @@ Medie</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nu s-a putut parsa „%s”</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Query-ul get_events nu a reușit.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3666,33 +4336,33 @@ Medie</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nu s-a putut deschide stylesheet-ul %s</translation>
     </message>
@@ -3702,451 +4372,451 @@ Medie</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Prea multe amestecuri de gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 scufundări)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 scufundare)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>ambarcațiune</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>țărm</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>derivă</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>adânc</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>cavernă</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>gheață</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>epavă</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>peșteră</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>altitudine</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>piscină</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>lac</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>râu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>noapte</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>proaspăt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>fotografie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>videoclip</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>instructor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>decompresie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -4196,97 +4866,97 @@ EADD: %d%s
         <translation>(nicio scufundare)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Duminică</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Luni</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Marți</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Miercuri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Joi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Vineri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Sâmbătă</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Iun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Iul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Noi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -4321,92 +4991,92 @@ Este Uemis Zurich conectat corect?</translation>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Citind %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>id-ul înregistrării în divelog</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>id-ul înregistrării în divespot</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>drysuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>full suit 2 părți</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrană</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Inițializează Comunicarea</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Inițializarea Uemis a eșuat</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Începe descărcarea</translation>
     </message>
@@ -4501,12 +5171,279 @@ Este Uemis Zurich conectat corect?</translation>
         <translation>Alertă de Baterie Scăzută</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Dată</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Timp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Locație</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Vizibilitate</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Companion</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Costum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Timp Total</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tip</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Mărime</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Coordonate</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation type="unfinished"/>
@@ -4628,37 +5565,43 @@ Este Uemis Zurich conectat corect?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4673,27 +5616,33 @@ Este Uemis Zurich conectat corect?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4719,17 +5668,17 @@ Este Uemis Zurich conectat corect?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 9aadc2637..37e02b4b3 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Переключить на</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Нажмите здесь чтобы удалить этот баллон.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Баллон не может быть удален</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Костюм</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Инструктор</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Партнер</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Видимость</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Примечания</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Метки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Грузы</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Баллоны</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Нажмите здесь чтобы удалить этот дайвкомпьютер.</translation>
     </message>
@@ -122,14 +695,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/мин</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@
         <translation>Показать поле поиска</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Развернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Свернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Свернуть остальные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Удалить из поездки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Создать поездку выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Добавить к поездке сверху</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Добавить к поездке снизу</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Объединить с поездкой выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Объединить с поездкой ниже</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Пометить как ошибочное(-ые)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Объединить выбранные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Перенумеровать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Сдвиг времени</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Загрузить фото</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Открыть файлы изображений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Выделенные погружения</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Все погружения</translation>
     </message>
@@ -277,11 +842,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Минимальный Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Экспорт журнала</translation>
@@ -302,143 +862,148 @@
         <translation>Нумерация Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Только список</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Настройки стиля</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Светлая</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Песочная</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV файлы (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Значения, разделенные запятой. Включает наиболее важную информацию о профиле погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Отправить данные погружения на сайт divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Собственный XML-формат Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Файл для UDDF экспорта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Файл для CSV экспорта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Файл для экспорта карты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлы (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Экспорт Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML файлы (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Экспортировать HTML файл как</translation>
     </message>
@@ -628,42 +1193,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Время отсчета</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Исп. газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>Установка CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Отменить план?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Вы собираетесь отказаться от плана.</translation>
     </message>
@@ -671,17 +1236,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Путевые точки плана</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Доступные смеси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Добавить путевую точку</translation>
     </message>
@@ -762,67 +1327,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>мин</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/мин</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>фунт</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>фунт</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>не выбраны погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>не удалось создать ZIP файл для загрузки: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>невозможно создать временный файл: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>внутренняя ошибка: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>внутренняя ошибка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Выгрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Загрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Загрузка %1 погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Загрузка завершена - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Поврежденная загрузка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Невозможно открыть архив:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Выгрузка не удалась</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Выгрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Ошибка входа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Ошибка разбора ответа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Ошибка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Выгрузка завершена</translation>
     </message>
@@ -948,32 +1543,32 @@
         <translation>Найти дайвкомпьютер Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Файлы журналов (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Дамп-файлы (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>Сохранить дамп-файл libdivecomputer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -1091,27 +1704,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Погружение</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Темп. воздуха</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Темп. воды</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
@@ -1258,67 +1871,61 @@
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Темп. воздуха [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Темп. воды [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Редактирование поездки.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Множественное редактирование.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Редактирование погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Местоположение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation> и </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Отменить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Вы собираетесь отменить свои изменения.</translation>
     </message>
@@ -1345,82 +1952,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>График pHe</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Расчет всех тканей</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Потолок компьютера</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Расчетный потолок</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>3м шаг для расчетного потолка</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Пульс</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>SAC</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Рулетка</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Миниатюры фотографий</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Детальный план погружения&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>Журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>Новый журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Импорт координат из веб-сервиса Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>След. компьютер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>О Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Карта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Импорт с сайта divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>Полный экран</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Переключить полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>Проверить обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Экспорт журнала</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Альтернативный масштаб</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Импорт из дайвкомпьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>Перенумеровать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>График pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>График pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>Мои дайв-компьютеры</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Добавить погружение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Авто-группировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>Статистика по годам</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Список погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Пред. компьютер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Влево</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Вправо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Руководство пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>Планировщик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Импорт журналов</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Импортировать журнал погружений из другой программы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Печать плана погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Статистика по годам</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Открыть журнал погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Файлы журналов (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML файлы (*.xml);;UDDF/UDCF файлы(*.uddf *.udcf);;JDiveLog файлы(*.jlb);;Suunto файлы(*.sde *.db);;CSV файлы(*.csv);;Все файлы(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
     </message>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>фут/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Последняя остановка на 20фт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% ср. глубины - 20фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20фут - поверхность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Последняя остановка на 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% ср. глубины - 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6м - поверхность</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Единицы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Анимация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Очистить все натройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Сбросить все настройки в значение по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Система мер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Метрическая</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Имперская</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Настроить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>метр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>литр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>цельсий</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>фаренгейт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Системные настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Тип прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Требуется авторизация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Давление</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Списки и таблицы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Журнал по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Показывать ошибочные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Баллон по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Использовать по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Веб-сервис Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>ID пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Сохранять ID пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Объем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Единицы времени</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Минуты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Секунды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Показывать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow на макс. грубине</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Разное</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Делитель скорости спуска/подъема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Предельное значение pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Предельное значение pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Предельное значение pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Макс. pO₂ при отображении MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Показывать потолок дайвкомпьютера красным</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Показывать неиспользуемые баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Показывать среднюю глубину</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Необходим перезапуск</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Для смены языка необходимо перезапустить Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Выберите журнал по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Печать</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface не может найти принтеры в вашей системе!</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Погр#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Инструктор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Погружение №%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Макс. глубина: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Длительность: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Исп. газы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Метки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Грузы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Инструктор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Видимость:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Рейтинг:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 из %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Сделать первым компьютером</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Удалить этот дайвкомпьютер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Добавить замену газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Удалить событие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Скрыть похожие события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Изменить закладку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Показать все события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Скрыть событие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Спрятать все %1 события?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Удалить выбранное событие?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Изменить закладку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Слишком длинное название!</translation>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Удалить эту точку</translation>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Выберите место на карте двойным щелчком мыши.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Неверный ответ сервера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Неверный XML ответ. Строка %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Вебсервис</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Соединение...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Загрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Ошибка загрузки: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Ошибка соединения:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Загрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Неверный идентификатор пользователя!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation>Укажите КЛЮЧ и нажмите Загрузить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Невозможно разобрать ответ!</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>Проверьте Интернет-соединение.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Вы используете самую актуальную версию Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Доступна новая верся Subsurface.&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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Доступна новая версия Subsurface.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3701,85 @@ p, li { white-space: pre-wrap; }
         <translation>Также будет отправлена информация о вашем компьютере</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Операционная система: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Архитектура ЦПУ: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Язык: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Предлагать заполнить опросник в будущем?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Больше не спрашивать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Спросить позже</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Отправить опросник.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Спрашивать снова?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Отправить</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 ОС ЦПУ Архитектура: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Не удалось отправить опросник.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Возникла ошибка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Проверьте Интернет-соединение.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Опросник успешно отправлен.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3787,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -3182,12 +3840,12 @@ OS CPU Architecture: %1</source>
         <translation>Выгрузить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Таймаут выполнения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Передача данных...</translation>
     </message>
@@ -3195,97 +3853,110 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Нажмите здесь чтобы удалить эту грузовую систему.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Год 
  &gt; Месяц / Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Длительность
 Общее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Кратчайшее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Самое долгое</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Глубина (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Темп. (%1)
@@ -3295,87 +3966,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>Па</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>м/с</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>фут/мин</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>фут/с</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>воздух</translation>
     </message>
@@ -3417,229 +4087,229 @@ Maximum</source>
         <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>отсутствует</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>деко стоп</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>оставшееся время на дне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>подъем</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>потолок</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>нагрузка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>передатчик</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>закладка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>поверхность</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>остановка безопасности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>замена смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>остановка безопасности (добровольно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>остановка безопасности (обязательно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>глубокая остановка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>потолок (остановка безопасности)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>время погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>ниже пола</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>макс. глуб.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>оставшееся время по воздуху</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>направление</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>насыщение тканей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>время без остановки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>неверный номер события</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Невозможно создать анализатор для %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Ошибка регистрации данных</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Ошибка разбора даты/времени</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Погр. №%d - %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Ошибка разбора времени погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Ошибка разбора макс. глубины</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Ошибка получения солености воды</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Ошибка получения давления на поверхности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Ошибка разбора смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Ошибка разбора выборки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Событие: ожидание действия пользователя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Ошибка импорта данных погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Невозможно открыть %s %s (%s)</translation>
     </message>
@@ -3651,19 +4321,19 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Ошибка разбора &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Ошибка запроса get_events в БД.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Запрос get_tags в базу не выполнился.
@@ -3677,36 +4347,36 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Ошибка запроса к БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Запрос get_cylinders в базу не выполнился.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Запрос get_changes в базу не выполнился.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Запрос get_profile_sample в базу не выполнился.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Невозможно открыть файл преобразования %s</translation>
     </message>
@@ -3716,136 +4386,136 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Невозможно найти газ %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Слишком много смесей</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Расчет деко прекращен из-за большой длительности</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>на основе GFlow = %d и GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>План погружения Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>глубина</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>отсчет</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>длительность</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>смесь</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dмин</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Переключение на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Расход газов:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Внимание:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>расход выше чем запас газа в указанном баллоне!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>недостаточно газа для резерва при подъеме</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3854,70 +4524,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>Д: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>Т: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>С: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3926,7 +4596,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3935,262 +4605,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ост. безопасности: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ост. безопасности: неизв. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Деко: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Деко: неиз. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>В деко
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Деко: %uмин @ %.0f%s (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>В деко (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Расчетный потолок %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Ткань %.0fмин: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>пульс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>азимут: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sГ:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sГ:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sД:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 погружений)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 погружение)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>с лодки</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>с берега</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>течение</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>глубокое</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>каверна</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>подледное</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>рэк</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>пещера</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>высокогорье</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>бассейн</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>в озере</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>в реке</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>ночное</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>пресная</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>ученик</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>фото</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>видео</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>инструктор</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>деко стоп</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>л</translation>
     </message>
@@ -4240,97 +4910,97 @@ EADD: %d%s
         <translation>(нет погружений)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Янв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Мар</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Июн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Июл</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Снт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Ноя</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -4365,92 +5035,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Чтение %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>данные</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>ид. записи журнала</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>ид. места погружения</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>ид. дополнительных данных погружения</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>мокрый</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>полусухой</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>сухой</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>короткий</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>жилет</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>комбинезон</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>куртка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>полный</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>полный из 2-х</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>мембрана</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Инициализация связи</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Ошибка инициализации Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Начать загрузку</translation>
     </message>
@@ -4545,12 +5215,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Тревога: заряд батареи</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Невозможно открыть файл %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Время</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Темп. возд.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Темп. воды</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Статистика</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Видимость</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Партнер</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Костюм</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Метки</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Примечания</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Статистика по годам</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Год</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Общее время</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Мин. глуб.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Макс. глуб.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Мин. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Макс. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Мин. темп.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Макс. темп.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Объем</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Вес</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Координаты</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Дата:</translation>
@@ -4672,37 +5609,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Падение к первой глубине</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Последняя остановка на 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Перерывы на основной газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Газы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC на дне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>SAC на деко</translation>
     </message>
@@ -4717,27 +5660,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>pO₂ на деко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>План погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Показать отсчет</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Показать время сегмента</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Показать переходы в деко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Подробный план</translation>
     </message>
@@ -4763,17 +5712,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>6м - поверхность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Показывать время отсчета для остановок (абсолютное время)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Показывать длительность остановок (относительное время)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 ffeadfc59..84f25612d 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -1,6 +1,513 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <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="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation>Neviem otvoriť zálohu: </translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation>Nastavenie bolo úspešne uložené do zariadenia</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation>Záloha</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation>Serial No.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation>Angličtina</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation>Nemčina</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation>Francúzčina</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation>Taliančina</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation>MMDDYY</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation>DDMMYY</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation>YYMMDD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation>2s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation>10s</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation>Štandard</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation>Červená</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation>Zelená</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation>Modrá</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation>Synchronizácia času počítača s PC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation>%O2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation>%He</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation>Zmes 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation>Zmes 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation>Zmes 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation>Zmes 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation>Zmes 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation>SP 1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation>SP 2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation>SP 3</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation>SP 4</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation>SP 5</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation>Detaily počítača úspešne načítané.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation>Záložné súbory (*.xml)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation>Chyba XML zálohy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <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="405"/>
+        <source>Backup succeeded</source>
+        <translation>Vytvorenie zálohy úspešné</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <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="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation>Obnova nastavenia počítača</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation>Chyba XML obnovy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <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="431"/>
+        <source>Restore succeeded</source>
+        <translation>Úspešná obnova</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation>Nastavenia boli obnovené úspešne.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation>Vyber súbor s firmware</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation>Všetky súbory (*.*)</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +550,90 @@
         <translation>Zmeň v</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknutím sem vymažeš fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaša nemôže byť vymazaná</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation>Výber komponentov</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation>Ktoré komponenty chceš kopírovať</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation>GPS súradnice</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Hodnotenie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Viditeľnosť</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Závažia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Fľaše</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +656,22 @@ vybraný počítač?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>ID zariadenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Voliteľný názov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Kliknutím sem vymažeš počítač.</translation>
     </message>
@@ -122,14 +697,6 @@ vybraný počítač?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +704,87 @@ vybraný počítač?</translation>
         <translation>Zobraziť vyhľadávací box</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Expandovať všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Zredukovať všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Zbaliť ostatné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Vymazať ponor(y) z akcie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Vytvoriť novú akciu nad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Spoj akciu s akciou nad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Spoj akciu s akciou pod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Zmazať ponor(y)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Neplatný ponor(y)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Spojiť vybraté ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Prečíslovanie ponorov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Posun času</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Nahrať obrázky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Otvoriť súbory s obrázkami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +828,13 @@ vybraný počítač?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Vybrané ponory</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Všetky ponory</translation>
     </message>
@@ -277,11 +844,6 @@ vybraný počítač?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Export </translation>
@@ -302,143 +864,148 @@ vybraný počítač?</translation>
         <translation>Subsurface čísla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation>Export ročných štatistík</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Export zoznamu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Nastavenia štýlov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Veľkosť fontu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Téma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Svetlo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Piesok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF súbory (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV súbory (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Čiarkou oddelené hodnoty obsahujúce najrelevantnejšie informácie o profile ponoru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML formát.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Exportovať UDDF súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Exportovať CSV súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Exportovať mapu sveta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML súbory (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exportovať </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML súbory (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exportovať HTML súbor ako</translation>
     </message>
@@ -628,42 +1195,42 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Cieľová hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Aktuálny čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Použitá zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC SetPoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Vymazať plán?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Chystáš sa vymazať svoj plán.</translation>
     </message>
@@ -671,17 +1238,17 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Body plánu ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Zmesi k dispozícii</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Pridať data point ponoru</translation>
     </message>
@@ -762,67 +1329,97 @@ vybraný počítač?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Hodnotenie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Mins</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation>Záťaž(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation>Zmes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>US libra</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation>Hĺbka(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>Spotreba plynu</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation>Tepll(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1427,95 @@ vybraný počítač?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>neboli vybrané žiadne ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>interná chyba: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>interná chyba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Nahrávanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Sťahovanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Sťahovanie %1 ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Poškodené sťahovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Nahrávanie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Úspešne nahrávanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Prihlásenie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Neviem spracovať odpoveď</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Chyba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Nahrávanie ukončené</translation>
     </message>
@@ -948,32 +1545,32 @@ vybraný počítač?</translation>
         <translation>Hladať Uemis DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Log súbory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump súbory</translation>
     </message>
@@ -1037,6 +1634,24 @@ vybraný počítač?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Uložiť </translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation>Nahratie do novej akcie</translation>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <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="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1665,7 @@ vybraný počítač?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
@@ -1091,27 +1706,27 @@ vybraný počítač?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Teplota vzduchu</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Teplota vody</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
@@ -1258,67 +1873,61 @@ vybraný počítač?</translation>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Teplota vzduchu [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Teplota vody [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Táto akcia je editovaná.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Viaceré ponory sú editované.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Tento ponor sa edituje.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Lokalita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>neznámy</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Najhlbší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Najplytší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1936,17 @@ vytvorene zo vzduchu a:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>a</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Vymazať zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Chystáš sa vymazať zmeny.</translation>
     </message>
@@ -1345,82 +1954,97 @@ vytvorene zo vzduchu a:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Prepnúť pHe graf</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Prepnúť výpočet všetkých tkanív</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Prepnúť zobrazenie stropu podľa počítača</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Prepnúť na vypočítaný strop</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Prepnúť NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Prepnúť na </translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Prepnúť tepovú frekvenciu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Prepnúť MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Prepnúť </translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Prepnúť SAC spotrebu</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Prepnúť pravítko</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Prepnúť zobrazenie obrázkov</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detailný plán ponoru&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Tlačiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2057,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Náhľad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nový logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Otvoriť logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Otvor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Uložiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Uložiť a&amp;ko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Uložiť ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Na&amp;stavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Import &amp;GPS data zo Subsurface webu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation>Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation>Ctrl+V</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Všetko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Nasledujúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Zemeguľa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Import z &amp;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Prepnúť celú obrazovku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Kontrola novšej verzie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Export</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exportovať všetko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Zmeniť škálu hĺbkovej osy</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Tlačiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Ukončiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Import z &amp;počítača</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Prečisluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Prepnúť pO₂ Graf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Prepnúť pN₂ Graf</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Editovať názov zariadenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Pridanie ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>&amp;Automatické zoskupovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Ročné štatistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Zoznam &amp;ponorov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>P&amp;redchádzajúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Šipka v ľavo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Šipka v pravo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Uživateľský &amp;manuál</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lánovanie ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>Import z &amp;log súborov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Import log súborov z iných aplikácii</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Vytlačiť runtime tabuľku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Ročná štatistika</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Uložiť zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Uložiť súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Otvoriť log súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Log súbory (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML súbory (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog súbory(*.jlb);;Suunto súbory(*.sde *.db);;CSV súbory(*.csv);;Všetky súbory(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2508,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Posledná zastávka v 20 stopách</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% priemernej hĺbky do 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft na hladinu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Posledná zastávka v 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% priemernej hĺbky do 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m na povrch</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation>cuft/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Predvolené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Sieť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Veľkosť fontu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Použiť prednastavenú hodnotu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animácie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Rýchlosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Zmazať všetky nastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Nastaviť všetky nastavenia na pôvodné hodnoty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Systém</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrický</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperiálny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personalizácia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>stopa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Systémove prednastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Typ proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Vyžaduje autentifikáciu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Zoznamy a tabuľky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Predvolený súbor s ponormi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Zobraziť neplatné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Predvolená fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Použi prednastavenú fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Predvolené užívateľské ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Uložiť uživateľské ID lokálne?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Objem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Časové jednotky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Zobraziť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow na max. hĺbke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Rôzne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Nastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Menovateľ rýchlosti pre výstup/zostup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Hranica pre zobrazenie pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Hranica pre zobrazenie pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Hranica pre zobrazenie pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Max ppO₂ pri zobrazení MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Strop určený počítačom zobraziť červenou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Zobraziť nepoužité fľaše v záložke výstroja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Zobraziť priemernú hĺbku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2918,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Potrebný reštart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Otvoriť predvolený Log súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
@@ -2333,49 +2965,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Tlačiť</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface nevie nájsť žiadnu nainštalovanú tlačiareň</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Ponor č.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <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>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3070,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Ponor #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Max hĺbka: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Trvanie: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Použitá zmes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Značky:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Závažia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Viď:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Hodnotenie:</translation>
     </message>
@@ -2511,82 +3143,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 z %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Zmazať tento počítač</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Pridaj zmenu zmesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Pridať Bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Vymazať udalosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Schovaj podobné udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Editovať meno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Zobraziť všetky udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Schovaj udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Schovať všetky %1 udalosti?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Zmazať vybrané udalosti?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Editovať meno záložky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Príliš dlhý názov!</translation>
     </message>
@@ -2599,7 +3231,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Odstrániť tento bod</translation>
     </message>
@@ -2624,72 +3256,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Neplatná odpoveď zo servera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <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="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3494,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Pripájam...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Chyba sťahovania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Chyba spojenia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Sťahovanie úspešné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Neplatný identifikátor užívateľa!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Nemôžem spracovať odpoveď!</translation>
     </message>
@@ -2905,17 +3550,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3596,32 @@ p, li { white-space: pre-wrap; }
         <translation>Prosím, skontroluj pripojenie na internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <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="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Nová verzia Subsurface je k dispozícii.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation>Najnovšia verzia je</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,79 +3703,84 @@ p, li { white-space: pre-wrap; }
         <translation>Nasledujúce informácie o Tvojom systéme budú taktiež odoslané</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operačný systém: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU architektúra: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Jazyk: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <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="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Viac sa ma nepýtajte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Spýtajte sa neskôr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Odoslať dotazník.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Spýtať sa znova?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Poslať</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>OS CPU architektúra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Vyskytla sa nasledujúca chyba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>Prosím, skontroluj pripojenie na internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Dotazník úspešne odoslaný.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3128,12 +3788,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3181,12 +3841,12 @@ OS CPU Architecture: %1</source>
         <translation>Nahratie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Čas operácie vypršal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Prenášanie dát...</translation>
     </message>
@@ -3194,94 +3854,107 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Kliknutím sem vymažeš tento záťažový systém.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <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="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Mesiac / Akcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Trvanie
 Celkové</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>Najkratší</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>Najdlhší</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Hĺbka (%1)
  Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3291,87 +3964,86 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) alebo (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
@@ -3413,229 +4085,229 @@ Maximum</translation>
         <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>žiaden</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>dekompresná zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>výstup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>záťaž</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>vysielač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>prekročenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>poznámka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>povrch</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>bezpečnostná zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>zmena plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>bezpečnostná zastávka (dobrovoľná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>bezpečnostná zastávka (povinná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>hĺbková zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (bezpečnostná zastávka)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>čas ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>pod stropom</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>max. hĺbka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>čas na vzduchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>smer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>upozornenie nasýtenia tkanív</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>non stop čas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>neplatné číslo udalosti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Chyba registrácie dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba spracovania času</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Ponor #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Chyba spracovania času ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Chyba spracovania maximálnej hĺbky</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba získania slanosti vody</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba pri zisťovaní tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Chyba spracovania vzoriek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Udalosť: Čakanie na vstup uživateľa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Chyba importu dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie je možné otvoriť %s %s (%s)</translation>
     </message>
@@ -3647,19 +4319,19 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Chyba pri spracovaní &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Neúspešná požiadavka: get_events.⏎
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Databázová požiadavka get_tags zlýhala.
@@ -3673,36 +4345,36 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Databázová požiadavka get_cylinders zlýhala.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Databázová požiadavka get_changes zlyhala.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Databázová požiadavka get_profile_sample zlyhala.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Neviem otvoriť šablónu </translation>
     </message>
@@ -3712,140 +4384,140 @@ Maximum</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Neviem nájsť zmes %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Príliš veľa zmesí</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface plán ponoru</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>hĺbka</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>trvanie</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>plyn</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Zmena plynu na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Spotreba plynu:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Upozornenie:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3854,70 +4526,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3926,7 +4598,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3935,262 +4607,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>V deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Vypočítaný strop %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tkanivo %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>tep srdca: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>smer: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 ponorov)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 ponor)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>z lode</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>z brehu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>prúdový</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>hlboký</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>dutina</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>ľad</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>vrak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>jaskyňa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>výškovy</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>bazén</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>jazero</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>rieka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>nočný</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>čerstvý</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>študent</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>fotenie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>kamera</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>inštruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4240,97 +4912,97 @@ EADD: %d%s
         <translation>(žiadné ponory)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Ut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>St</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Št</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Pi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -4365,92 +5037,92 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Načítavam %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>id položky logu</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>id dát miesta ponoru</translation>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation>potápačský denník #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>id ďalších dát ponoru</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation>miesto ponoru </translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation>detaily pre #</translation>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>neoprén</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>polosuchý</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>suchý oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>krátky</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>vesta</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>vesta</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>celotelový oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 dielny oblek</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Inicializácia komunikácie</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis - inicializácia neúspešná</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Začať nahrávanie</translation>
     </message>
@@ -4545,12 +5217,279 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>Alarm: Slabá batéria</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Neviem otvoriť súbor</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation>Číslo</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Teplota vzduchu</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Teplota vody</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation>ponory</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation>Otvoriť všetky</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation>Zatvoriť všetky</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation>akcie</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Štatistika</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation>Pokročilé vyhľadávanie</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Hodnotenie</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Viditeľnosť</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation>DiveMaster</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation>Zobraziť viac detailov</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Ročná štatistika</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Rok</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Celkový čas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation>Priemerný čas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation>Najkratší čas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation>Najdlhší čas</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation>Priemerná hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min. hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Max. hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation>Priemerná SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min. spotreba</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max. spotreba</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation>Priemerná teplota</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min. teplota</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max. teplota</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation>Spǎť na zoznam</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation>Ponor No.</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation>Profil ponoru</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation>Informácia o ponore</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation>Vybavenie ponoru</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Veľkosť</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation>Pracovný tlak</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation>Počiatočný tlak</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation>Koncový tlak</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation>Zmes</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Hmotnosť</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation>Udalosti</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation>Meno</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation>Hodnota</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Súradnice</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation>Stav ponoru</translation>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Dátum:</translation>
@@ -4672,37 +5611,43 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Priamy zostup do prvej hĺbky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Posledná zastávka v 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Plánovanie back gas zastávok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Nastavenia zmesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC na dne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>SAC pri dekompresii</translation>
     </message>
@@ -4717,27 +5662,33 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>pO₂ pri dekompresii</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Zobraziť priebeh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Zobraziť trvanie segmentu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Zobraziť prechody medzi deco zastávkami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Ukecaný plán ponoru</translation>
     </message>
@@ -4763,17 +5714,17 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>6m na hladinu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 e9b68cf9b..94b499395 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -3,6 +3,511 @@
 <TS version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -45,22 +550,90 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -82,22 +655,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -123,14 +696,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -138,87 +703,87 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -262,13 +827,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation type="unfinished"></translation>
     </message>
@@ -278,11 +843,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation type="unfinished"></translation>
@@ -303,143 +863,148 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"></translation>
     </message>
@@ -629,42 +1194,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -672,17 +1237,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -763,67 +1328,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -831,94 +1426,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -948,32 +1543,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1037,6 +1632,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1091,27 +1704,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1258,84 +1871,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1343,82 +1950,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1427,454 +2049,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1882,380 +2500,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2280,32 +2910,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2327,49 +2957,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2432,72 +3062,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2505,82 +3135,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2593,7 +3223,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2618,72 +3248,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2843,47 +3486,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2899,17 +3542,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2945,22 +3588,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3042,76 +3695,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,12 +3777,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3172,12 +3830,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3185,88 +3843,101 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -3275,87 +3946,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3397,229 +4067,229 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3630,18 +4300,18 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"></translation>
@@ -3653,32 +4323,32 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3688,450 +4358,450 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4181,97 +4851,97 @@ EADD: %d%s
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4301,92 +4971,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
+        <location filename="../uemis-downloader.c" line="420"/>
+        <source>data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="403"/>
-        <source>data</source>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4481,12 +5151,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation type="unfinished"></translation>
@@ -4608,37 +5545,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4653,27 +5596,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4699,17 +5648,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 ec406a7bb..77e865884 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Byt vid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klicka här för att ta bort denna flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan inte tas bort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Plats</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Dräkt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Parkamrat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Rankning</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Synlighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Anteckningar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Taggar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Vikter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Flaskor</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Enhetsid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klicka här för att ta bort denna dykdator</translation>
     </message>
@@ -122,14 +695,6 @@ radera den valda dykdatorn?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ radera den valda dykdatorn?</translation>
         <translation>Visa sökruta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Fäll samman andra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Ta bort dyk från resa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>Ny resa ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>Sammanfoga resa med resan ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>Sammanfoga resa med resan under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Radera dyk(en)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>Markera dyk som ogiltiga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Slå samman valda dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Uppdatera numrering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Förskjut tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Ladda bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Öppna bildfler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ radera den valda dykdatorn?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Markerade dyk</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Alla dyk</translation>
     </message>
@@ -277,11 +842,6 @@ radera den valda dykdatorn?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimalt med Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Exportera dykloggar</translation>
@@ -302,143 +862,148 @@ radera den valda dykdatorn?</translation>
         <translation>Subsurface siffror</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Exportera enbart listan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Ljus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>Kommaseparerade värden som innehåller den mest relevanta informationen om dykprofilen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface eget XML-format.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>Exportera som UDDF fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>Exportera CSV-fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Exportera världskarta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTMLfiler (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Exportera Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Exportera HTML filer son</translation>
     </message>
@@ -628,42 +1193,42 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Slutdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Löptid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Använd gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>Kassera plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>Du kommer kassera din plan</translation>
     </message>
@@ -671,17 +1236,17 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>Dykplaneringspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Tillgänglig gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>lägg till dykdatapunkt</translation>
     </message>
@@ -762,67 +1327,97 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Rankning</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Minuter</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>pund</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,95 +1425,95 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>inga dyk var markerade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>internt fel: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>internt fel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Laddar upp dyklista...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Laddar ner dyklista...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>Laddar ner %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>Nedladdning klar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>Misslyckad nedladdning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Uppladdning misslyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Uppladdningen lyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Inloggning misslyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Fel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Uppladdning klar</translation>
     </message>
@@ -948,32 +1543,32 @@ radera den valda dykdatorn?</translation>
         <translation>Hitta Uemis dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <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="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <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="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>Dumpfiler (*.bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@ radera den valda dykdatorn?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Spara dumpfil ifrån dykdatorn</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ radera den valda dykdatorn?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
@@ -1091,27 +1704,27 @@ radera den valda dykdatorn?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Dykanteckningar</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Lufttemp</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Vattentemperatur</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
@@ -1258,67 +1871,61 @@ radera den valda dykdatorn?</translation>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemperatur [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Vattentemperatur [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <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="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <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="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <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="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Resmålsanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>okänd</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Djupaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Grundaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ mixas av luft och:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>och</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Kassera ändringarna?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>Du är påväg att kasta bort dina förändringar</translation>
     </message>
@@ -1345,82 +1952,97 @@ mixas av luft och:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>Slå av/på pHe grafen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Slå av/på beräkningen av alla vävnader</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Slå av/på dykdatorrapporterat takinformation</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Slå av/på  beräknad takinformation</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation> Slå av/på NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Slå av/på beräknad takinformation i 3m steg</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Slå av/på hjärtrytm</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>Slå av/på MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Slå av/på EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>Slå av/på SAC</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Slå av/på mätverktyget</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Slå av/på visningen av tumnaglar</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dykplansdetaljer&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny Loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Öppna loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>Spara som(&amp;v)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Spara som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>Inställning&amp;r</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importera &amp;GPSdata från Subsurface webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Nästa DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>Om Subsurface(&amp;a)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importera &amp;från divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fullskärm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Växla fullskärmsläge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Exportera Dyk Loggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Skala om djupaxeln</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumrering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>Slå av/på pO₂ grafen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>Slå av/på pN₂ grafen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Ändra Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>Lägg till dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>Autogruppering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>Dyklista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>Fö&amp;regående dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Vänster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Höger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>Användar&amp;manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lanera dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importera loggfiler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Importera loggfiler ifrån andra applikationer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>Skriv ut körtidstabell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Årsstatistik</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Spara ändringar?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Öppna dyklogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Dykloggfiler (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML filer (*.xml);;UDDF/UDCF filer(*.uddf *.udcf);;JDiveLog filer(*.jlb);;Suunto filer(*.sde *.db);;CSV Files(*.csv);;Alla filer(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <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>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>Sista stoppet på 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% av snittdjup till 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>20ft till ytan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdjup till 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>6m till ytan</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Standardvärden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Använd standardvärden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animationer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Hastighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Rensa alla inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Återställ alla inställningar till deras standardvärde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Personifiera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>fot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Systemets standardvärde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Värd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Kräver authentisering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Listor och tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Standard dykloggfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>Display ogiltig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Standardflaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Använd standardflaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Förvalt användarid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Spara användarid lokalt?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Volym</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Tidsenheter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Minuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>GFLow på maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Blandat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Hastighetsnämnare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>Tröskelvärde vid visning av pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>Tröskelvärde vid visning av pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>Tröskelvärde vid visning av pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Maximalt pO₂, för visning av MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Visa dykdatorrapporterad takinformation i rött</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Visa oanvända flaskor i utrustningsfliken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Visa medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Omstart krävs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Öppna standarddykloggen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation>Subsurface kan inte hitta några skrivare på den här datorn</translation>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Dyknr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Maxdjup: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Varaktighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gas använd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Taggar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Vikter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Ranking:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 av %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>Gör till första dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Ta bort den här dykdatorn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Lägg till gasbyte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Lägg till bokmärke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>Ta bort händelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Göm liknande händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>Ändra namn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>Visa alla händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Göm händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>Göm alla %1händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>Ta bort markerad händelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Ändra namnet på bokmärket</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Valt namn:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>Namnet är för långt!</translation>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Ta bort denna punkt</translation>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Ogiltigt svar från server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Felformaterat XML svar. Rad %1: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Ansluter...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>Nedladdning klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>Nedladdningsfel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Kontaktfel:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>Nedladdningen lyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Ogiltigt användarid!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Kan inte tolka respons</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Du använder den senaste versionen av Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Det finns en ny version av Subsurface 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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Det finns en ny version av Subsurface tillgänglig.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,77 +3701,82 @@ p, li { white-space: pre-wrap; }
         <translation>Följande information om din dator kommer också att skickas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>Operativsystem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>Språk: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>Ska vi fråga dig senare?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Fråga inte mig igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Fråga senare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>Skicka in användarundersökningen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Fråga igen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Skicka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <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="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>Följande fel inträffade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Undersökningen har blivit inskickad.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3126,12 +3784,12 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3179,12 +3837,12 @@ OS CPU Arkitektur: %1</translation>
         <translation>Ladda upp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>Begäran tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Överför data...</translation>
     </message>
@@ -3192,94 +3850,107 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Klicka här för att ta bort detta viktsystem.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Månad / Resa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Varaktighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>Kortaste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>Längsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Djup (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -3289,87 +3960,86 @@ Medel</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -3411,229 +4081,229 @@ Medel</translation>
         <translation>Maximalt antalet kolumner i CSV import är %d</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>inget</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>dekostopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>uppstigning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>arbetsbelastning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>sändare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>kränkning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>bokmärke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>säkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gasbyte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>säkerhetsstopp (frivilligt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>säkerhetsstopp (obligatoriskt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>djupstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (säkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>under golv</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>gastid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>riktning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>vävnadsnivå</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>non stop tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>okänt händelsenummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Kunde inte registrera parser-data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Kunde inte tolka tid och datum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>Dyk #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Kunde inte tolka dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kunde inte tolka maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kunde inte få tag i tyck vid ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Kunde inte tolka gasblandning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Händelse: väntar på användaren</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Kunde inte registrera event-funktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Lyckades inte importera dykdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kunde inte öppna fil %s %s (%s)</translation>
     </message>
@@ -3645,19 +4315,19 @@ Medel</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Databasfråga get_events misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>Databasfrågan get_tags misslyckades.
@@ -3671,36 +4341,36 @@ Medel</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Databasfråga misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>Databasfrågan get_cylinders misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>Databasfrågan get_changes misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>Databasfrågan get_profile_sample misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kunde inte öppna formatmall %s</translation>
     </message>
@@ -3710,136 +4380,136 @@ Medel</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kan inte hitta gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>För många gasblandningar</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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: DETTA ÄR EN NY IMPLEMENTATION AV BÜHLMANN&apos;S DEKO ALGORITM OCH EN DYKPLANERARE BASERAD PÅ DEN, OCH KODEN HAR SETT ENDAST LITE TESTNING. VI FÖRESLÅR ATT MAN INTE GÖR DYK BASERADE ENBART PÅ RESULTATEN AV DENNA PLAN!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <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="546"/>
+        <location filename="../planner.c" line="535"/>
         <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="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>djup</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>körtid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>varaktighet</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>Byt gas till %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gasförbrukning:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Varning:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <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="684"/>
+        <location filename="../planner.c" line="673"/>
         <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="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3848,70 +4518,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3920,7 +4590,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3929,262 +4599,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>I Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beräknat tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Vävnad %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>hjärtrytm: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>båt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>strand</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>ström</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>djup</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>cavern</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>is</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>vrak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>grotta</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>höjd</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>pool</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>sjö</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>älv</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>natt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>färsk</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>student</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>Instruktör</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4234,97 +4904,97 @@ EADD: %d%s
         <translation>(inga dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>sön</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>mån</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>tis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>lör</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -4359,92 +5029,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Läser %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>dyklog ID</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>dykplats ID</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>mer data dive id</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>våtdräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>torrdräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>väst</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>Longjohn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>jacka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>fulldräkt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 pcs full suit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>membran</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Initierar anslutning</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Kunde inte läsa från Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Starta nedladdningen</translation>
     </message>
@@ -4539,12 +5209,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Batterivarning</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan inte öppna fil %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Plats</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Lufttemp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Vattentemperatur</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Statistik</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Rankning</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Synlighet</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Parkamrat</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Dräkt</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Taggar</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Anteckningar</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Årsstatistik</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>År</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Total tid</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Min. djup</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Maxdjup</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>Min. SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>Max SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Min. temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Max temp</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Storlek</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Vikt</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinater</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -4666,37 +5603,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>Ner till första djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>Planera pauser på bakgas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gasval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>Botten SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
@@ -4711,27 +5654,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>pO₂ under deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Dykanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>Visa körtid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>Visa stoppens tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>Visa byten av djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>Detaljerad dykplan</translation>
     </message>
@@ -4757,17 +5706,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>6m till ytan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <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="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <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="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 56c179236..3b2435b32 100644
--- a/translations/subsurface_tr.ts
+++ b/translations/subsurface_tr.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Tür</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Buraya tıklayarak bu tüp kaldırılır.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tüp kaldırılamaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Konum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Divemaster(Dalış lideri)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Değerlendirme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Görünütlük</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Notlar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>Etiketler</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>Ağırlıklar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Tüpler</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Cihaz Kimliği</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Rumuz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Buraya tıklayarak dalış bilgisayarını kaldır.</translation>
     </message>
@@ -122,14 +695,6 @@ kaldırmak istediğinizden emin misiniz?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation>Arama kutusunu göster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Hepsini aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>Geziden dalış kaldır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Dalış sil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>Seçili dalışları birleştir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>Dalışları yeniden numaralandır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Görüntüleri yükle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Görüntü dosyalarını aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ kaldırmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Seçili dalışlar</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Tüm dalışlar</translation>
     </message>
@@ -277,11 +842,6 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Dalış kayıt dosyalarını dışarı aktar</translation>
@@ -302,143 +862,148 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation>Subsurface numaraları</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Sadece listeyi dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Stil seçenekleri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Yazı tipi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Yazı tipi boyutu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>kum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF dosyaları (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV dosyaları (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <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="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface doğal XML biçimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>UDDF dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>CSV dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>Dünya haritasını dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML dosyaları (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>Subsurface XML dışa aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML dosyaları (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>HTML dosyası olarak dışarı aktar</translation>
     </message>
@@ -628,42 +1193,42 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>Final derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>Çalışma süresi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>Gaz kullanımı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>KD set noktası</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -671,17 +1236,17 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Mevcut gazlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>Dalış veri noktası ekle</translation>
     </message>
@@ -762,67 +1327,97 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Değerlendirme</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>Azami MSS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>libre</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>libre</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
@@ -830,95 +1425,95 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>Hiçbir dalış seçilmedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <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="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <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="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>iç hata: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>iç hata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>Bitti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>Dalış listesi yükleniyor ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>Dalış listesi indiriliyor ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 dalış indiriliyor...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>İndirme bitti- %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>İndirme bozuk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <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="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>Yükleme başarısız oldu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>Yükleme başarılı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>Giriş başarısız</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>Hata: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>Yükleme bitti</translation>
     </message>
@@ -948,32 +1543,32 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>Kayıt dosyaları (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -1037,6 +1632,24 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
@@ -1091,27 +1704,27 @@ kaldırmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>Dalış notları</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>Hava sıcaklığı.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>Su sıcaklığı.</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Notlar</translation>
     </message>
@@ -1258,84 +1871,78 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>Hava sıcaklığı. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>Su sıcaklığı. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>Bu gezi düzenleniyor.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>Çoklu dalış düzenleniyor.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>Bu dalış düzenleniyor.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>Gezi notları</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>Gezi konumu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>bilinmeyen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>Derin dalış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>Sığ dalış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>ve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>Değişiklikleri silinsin mi ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1343,82 +1950,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>&amp;Dosya</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>pHe grafik değiştir</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Tüm doku hesaplamalarını değiştir</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Hesaplanan tavanı değiştir</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>NDL, YZ geçişi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>Kalp atış hızı geçişi</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>MOD değiştir</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>EHD,  END, EHYD değiştir</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>Cetvel geçişi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>Küçük resimler gösterilirken geçiş</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dalış planı detayları&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>Yazdır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1427,454 +2049,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>&amp;Kayıt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>&amp;Görünüm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>&amp;Yardım</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>&amp;İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Yeni seyir defteri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Seyir defteri aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>Aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>&amp;Kaydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Kaydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>&amp;Farklı kaydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Farklı kaydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>&amp;Kapat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>&amp;Tercihler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>&amp;Subsurface web hizmetinden GPS verilerini içe aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>&amp;Bilgi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>&amp;Tümü</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Subsurface Hakkında</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>&amp;Dünya</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;divelogs.de&apos;den içe aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Tam ekran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>Tam ekran geçişi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Güncellemeler için denetle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>&amp;Dışa aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>Dalış Kyıtlarını Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>Derinlik eksenini yeniden ölçekle</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>&amp;Yazdır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>&amp;Çıkış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>&amp;Dalış bilgisayarından içe aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Yeniden numarala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>pO₂ Grafik Geçişi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>pN₂ Grafik Geçişi</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>&amp;Cihaz adını düzenle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Dalış ekle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>&amp;Otomatik grup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Yıllık istatistikler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Dalış listesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>Sol</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>Sağ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>&amp;Kullanıcı rehberi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>&amp;Dalış planı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Kayıt dosyalarını içe aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>Diğer uygulamalardan dalış kayıt dosyalarını içe aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>Dosya aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>Yıllık istatistikler</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>Değişiklikler kaydedilsin mi ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>Dalış kayıt dosyasını aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>Dalış kayıt dosyaları (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML dosyaları (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog dosyaları(*.jlb);;Suunto Files(*.sde *.db);;CSV Dosyaları(*.csv);;Tüm Dosyalar(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <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="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1882,380 +2500,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>fit/dak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>20 fit son durak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>Yüzeye 20 fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/dak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>6m son durak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>yüzeye 6m</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>Varsayılanlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Birimler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>Lisan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Yazı tipi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Yazı tipi boyutu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Dalışlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>Varsayılanı kullan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>Animasyonlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>Hız</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>Tüm ayarları temizle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>Varsayılan değerler için tüm ayarları sıfırlayın</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>Emperyal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>Kişisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>metre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>litre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>santigrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>fahrenhayt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>Varsayılan sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>Kimlik doğrulaması gerektirir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>Kullanıcı adı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Basınç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>Liste ve tablolar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>Varsayılan dalış kayıt dosyası</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>Varsayılan tüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>Varsayılan tüpü kullan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface web hizmeti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>Varsayılan kullanıcı kimliği</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>Yerel kullanıcı kimliği kaydedilsin mi ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>Hacim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Sıcaklık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>Zaman birimleri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>Dakika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>Saniye</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>Azami derinlikte EFDüşük</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>Çeşitli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Tercihler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Ekipman sekmesinde kullanılmayan tüpleri göster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>Ortalama derinliği göster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>EFDüşük</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>EFYüksek</translation>
     </message>
@@ -2280,32 +2910,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>Yeniden başlatma gerekli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <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="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>Varsayılan kayıt dosyasını aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
@@ -2327,49 +2957,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>Yazdır</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Dalış#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
-        <translation type="unfinished"/>
+        <translation>Divemaster(Dalış lideri)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2432,72 +3062,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>Dalış #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>Azami derinlik: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>Süre: %1 dak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>Gaz kullanımı:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>Etiketler:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>Ağırlıklar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>Notlar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>Divemaster(Dalış lideri):</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>Değerlendirme:</translation>
     </message>
@@ -2505,82 +3135,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>Dalış bilgisayarı sil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>Gaz değişimi ekle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>Yerimi ekle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>OLay kaldır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>Benzer olayları gizle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>İsmi düzenle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>Olayları gizle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <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="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>Yeriminde ismi düzenle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>Özel isim:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation>İsim çok uzun!</translation>
     </message>
@@ -2593,7 +3223,7 @@ p, li { white-space: pre-wrap; }
         <translation>HAVA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>Bu noktayı kaldır</translation>
     </message>
@@ -2618,72 +3248,85 @@ p, li { white-space: pre-wrap; }
         <translation>Azami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>fitküp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>Sunucudan geçersiz yanıt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2843,47 +3486,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Webservisi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Bağlanıyor...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>İndirme bitti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>İndirme hatası: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>Bağlantı hatası: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>İndirme başarılı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>Geçersiz kullanıcı tanımlayıcı!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <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="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Yanıt ayrıştırılamaz!</translation>
     </message>
@@ -2899,17 +3542,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>Tanımlama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2945,22 +3588,32 @@ p, li { white-space: pre-wrap; }
         <translation>Lütfen internet bağlantınızı kontrol edin.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>Subsurface programının son sürümünü kullanıyorsunuz.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>Subsurface  yeni bir sürümü mevcut.&lt;br/&gt;İndirmek için:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;tıklayın.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;Subsurface yeni bir sürümü mevcut.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3042,79 +3695,84 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 İşletim Sistemi: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 İşlemci Mimarisi: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 Lisan: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>Bana tekrar sorma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>Daha sonra sor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>Tekrar soruyorum ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Gönder</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <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="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>Anket başarıyla gönderildi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3122,12 +3780,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>Tanımlama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3175,12 +3833,12 @@ OS CPU Architecture: %1</source>
         <translation>Yükle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>İşlem zaman aşımı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>Veri aktarımı...</translation>
     </message>
@@ -3188,96 +3846,109 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Ağırlık sistemi buraya tıklayarak kaldırılır.</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Yıl 
  &gt; Ay / Seyahat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>Süre 
  Toplam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 Ortalama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 Kısa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 Uzun</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>Derinlik (%1)
  Ortalama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 Asgari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 Azami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Sıcaklık (%1)
@@ -3287,87 +3958,86 @@ Ortalama</translation>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>paskal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>fitküp</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/dak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/san</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>fit/dak</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>fit/san</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) veya (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>hava</translation>
     </message>
@@ -3409,229 +4079,229 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>hiçbiri</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>kdz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>çıkış</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>tavan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>iş yükü</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>yerimi</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>yüzey</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>güvenlik durağı</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>gazdeğişimi</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>güvenlik durağı (gönüllü)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>güvenlik durağı (zorunlu)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>Tavan (güvenlik durağı)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>dalış zamanı</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>azamiderinlik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLB</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>igbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>doku seviye uyarısı</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>geçersiz olay numarası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Veri kaydedilirken hata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>Tarih saat ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Dalış zamanı ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Azami derinlik ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>Su tuzluluğu edinme hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>Yüzey basıncı edinme hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>Gaz karışımı ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>Örnekleri ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>Olay: kullanıcı eylemi bekleniyor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>Olay işleyicisi kayıt hatası.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>Dalış verisi içe aktarma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -3642,18 +4312,18 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3666,33 +4336,33 @@ Ortalama</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -3702,202 +4372,202 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>%s gaz bulunamıyor</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Çok fazla gaz karışımı</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dalış planı</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>derinlik</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>çalışma süresi</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>süre</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3ddak</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>MSS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>Gaz tüketimi:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>Uyarı:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>MSS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3906,7 +4576,7 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3915,250 +4585,250 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %udak @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: bilinmeyen zaman @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>YZ: %udak
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>YZ: %udak (hesap)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>tekne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>sahil</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>buz</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>enkaz</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>irtifa</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>gölet</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>göl</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>nehir</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>stajer</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>fotoğraf</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>Eğitmen</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4208,97 +4878,97 @@ EHYD: %d%s
         <translation>(dalış yok)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>Pazar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>Pazartesi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>Salı</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>Çarşamba</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>Perşembe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>Cuma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>Cumartesi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Ocak</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Şubat</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Mart</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Nisan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Mayıs</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Haziran</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Temmuz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Ağustos</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Eylül</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Ekim</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Kasım</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Aralık</translation>
     </message>
@@ -4328,92 +4998,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>%s %s okunuyor</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>veri</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>dalış kıyafeti</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>yarı kuru</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>ceket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>İndirmeyi başlat</translation>
     </message>
@@ -4508,12 +5178,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Düşük Pil Uyarısı</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>%s dosyası açılamıyor</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Konum</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Değerlendirme</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Görünütlük</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>Etiketler</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Notlar</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>Yıllık istatistikler</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Tür</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Boyut</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Ağırlık</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>Koordinatlar</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Tarih:</translation>
@@ -4635,37 +5572,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>EF düşük</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>EF yüksek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>6m son durak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>Gaz seçenekleri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4680,27 +5623,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>Dalış notları</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4726,17 +5675,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>yüzeye 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 028b77648..90ac1cec2 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="vi" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>Loại</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>Chuyển đổi tại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <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="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <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>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>Đồ lặn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>Người lặn giỏi nhất</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>Bạn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>Xếp hạng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>Tầm nhìn</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>Ghi chú</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>Xilanh</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>Mô hình</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>Số hiệu Thiết Bị</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>Tên</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <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>
@@ -122,14 +695,6 @@ bỏ các máy lặn đã được chọn?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/nhỏ nhất</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation>Hiển thị hộp tìm kiếm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>Mở rộng tất cả</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <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="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <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="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <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="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <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="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <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="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <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="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>Xóa (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <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="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <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="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <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="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>Chuyển thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>Tải hình ảnh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>Mở tập tin hình ảnh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@ bỏ các máy lặn đã được chọn?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>Các lần lặn đã được chọn</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>Tất cả các lần lặn</translation>
     </message>
@@ -277,11 +842,6 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>Minimum Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>Xuất dữ liệu tập tin lưu trữ lần lặn</translation>
@@ -302,143 +862,148 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation>Số hiệu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>Chỉ danh sách xuất dữ liệu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>Chỉnh phần trang trí</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>Kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>Kích thước kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>Giao diện</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Sáng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Cát</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF files (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <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="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
     </message>
@@ -628,42 +1193,42 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -671,17 +1236,17 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>Dưỡng khí hiện có</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
@@ -762,67 +1327,97 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>Xếp hạng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>Xlanh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -830,94 +1425,94 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -947,32 +1542,32 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -1036,6 +1631,24 @@ bỏ các máy lặn đã được chọn?</translation>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1049,7 +1662,7 @@ bỏ các máy lặn đã được chọn?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
@@ -1090,27 +1703,27 @@ bỏ các máy lặn đã được chọn?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
@@ -1257,84 +1870,78 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>chưa rõ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -1342,82 +1949,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1426,454 +2048,450 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>Mới</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>Lưu lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>Lưu dưới dạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>Đóng lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <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="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -1881,380 +2499,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>Đơn vị</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>Kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>Kích thước kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>Lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>Số liệu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>Mật khẩu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>Bộ lọc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>Áp suất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>Tùy biến</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
@@ -2279,32 +2909,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -2326,49 +2956,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>Lần lặn#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>Giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2431,72 +3061,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -2504,82 +3134,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2592,7 +3222,7 @@ p, li { white-space: pre-wrap; }
         <translation>KHÔNG KHÍ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
@@ -2617,72 +3247,85 @@ p, li { white-space: pre-wrap; }
         <translation>Tối đa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <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="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2842,47 +3485,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>Dịch vụ web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>Đang kết nối...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <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="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>Không nhận được trả lời!</translation>
     </message>
@@ -2898,17 +3541,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2944,22 +3587,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="75"/>
+        <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3041,76 +3694,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Gửi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -3118,12 +3776,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
@@ -3171,12 +3829,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation type="unfinished"/>
     </message>
@@ -3184,88 +3842,101 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -3274,87 +3945,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) hoặc (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>không khí</translation>
     </message>
@@ -3396,229 +4066,229 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>không</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>dừng lại deco</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>đường dốc</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>trần</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>tải công việc</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>máy phát radio</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>độ xâm phạm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>đánh dấu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>bề mặt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>dừng an toàn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>thay đổi dưỡng khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>dừng an toàn (tự nguyện)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>dừng an toàn (bắt buộc)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>trần (độ an toàn)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>độ sâu tối đa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>thời gian không khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>thẳng tiến</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>cảnh báo cấp độ mô</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>không dừng lại thời gian</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>chỉ số sự kiện không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <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="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>Lỗi khi đăng ký dữ liệu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <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="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>Lỗi khi chuyển thông số thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <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="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <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="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <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="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <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="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <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="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <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="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <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="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <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="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <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="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Không thể mở %s %s (%s)</translation>
     </message>
@@ -3630,19 +4300,19 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <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="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>Thất bại khi truy vấn việc nhận_sự kiện từ cơ sở dữ liệu.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation type="unfinished"/>
@@ -3655,33 +4325,33 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <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="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -3691,450 +4361,450 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>Quá nhiều dưỡng khí được trộn</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>THẬN TRỌNG / CẢNH BÁO: ĐÂY LÀ PHẦN HOÀN THIỆN MỚI CỦA THUẬT TOÁN BUHLMANN VÀ DỰ TOÁN VỀ VIỆC LẶN DỰA TRÊN CÁC THÔNG SỐ NHẬN ĐƯỢC TỪ MỘT SỐ HỮU HẠN CÁC CUỘC THỬ NGHIỆM. CHÚNG TÔI MẠNH MẼ KHUYẾN CÁO BẠN KHÔNG NÊN HOÀN TOÀN DỰA VÀO CÁC THÔNG SỐ NÀY.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>thuyền</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>bờ biển</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>độ trôi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>sâu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>hang lớn</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>băng</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>vật trôi dạt</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>hang động</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>độ cao so với mặt biển</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>ao</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>hồ</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>sông</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>ban đêm</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>hình ảnh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -4184,97 +4854,97 @@ EADD: %d%s
         <translation>(không có cuộc lặn nào)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>CN</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>T2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>T3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>T4</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>T5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>T6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>T7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>Th1</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>Th2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>Th3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>Th5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>Th6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>Th7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>Th8</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>Th9</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>Th10</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>Th11</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>Th12</translation>
     </message>
@@ -4309,92 +4979,92 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>Đang đọc %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>dữ liệu</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>số dòng nhật trình lặn</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>số dữ liệu điểm lặn</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>thêm dữ liệu về chỉ số lần lặn</translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>ít ướt</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>đồ khô</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>ngắn</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>áo khoác</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>thiết bị đầy đủ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 bộ pcs đầy đủ</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>lớp màng</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>Thiết lập giao tiếp</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Thất bại cho việc thiết lập Uemis</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>Bắt đầu tải xuống</translation>
     </message>
@@ -4489,12 +5159,279 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <translation>Cảnh báo năng lượng yếu</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>Ngày tháng</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>Thời gian</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>Nhiệt độ không khí</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>Nhiệt độ trung bình của nước</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>Thống kê</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>Xếp hạng</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>Tầm nhìn</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>Bạn</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>Đồ lặn</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>Ghi chú</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>Năm</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>Tổng số thời gian</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>Độ sâu nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>Độ sâu tối đa</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>SAC nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>SAC tối đa</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>Nhiệt độ nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>Nhiệt độ tối đa</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>Loại</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>Kích thước</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>Cân nặng</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>Ngày tháng:</translation>
@@ -4616,37 +5553,43 @@ 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="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -4661,27 +5604,33 @@ 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="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation type="unfinished"/>
     </message>
@@ -4707,17 +5656,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="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <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 4103d55b1..0d8be25f0 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -1,6 +1,511 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+    <name>ConfigureDiveComputer</name>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="190"/>
+        <source>Could not save the backup file %1. Error Message: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="206"/>
+        <source>Could not open backup file: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputer.cpp" line="432"/>
+        <source>Setting successfully written to device</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigureDiveComputerDialog</name>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <source>Configure dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <source>Device or mount point</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <source>Retrieve available details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="61"/>
+        <source>Save changes to device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="81"/>
+        <source>Backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="88"/>
+        <source>Restore backup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="95"/>
+        <source>Update firmware</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="156"/>
+        <source>OSTC 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="174"/>
+        <source>Basic settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <source>Serial No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="197"/>
+        <source>Firmware version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="234"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="245"/>
+        <source>English</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="250"/>
+        <source>German</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <source>French</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <source>Italian</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="294"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="302"/>
+        <source>Date format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="318"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="323"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="341"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="503"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <source>Last deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="375"/>
+        <source> m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="382"/>
+        <source>Brightness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="393"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="398"/>
+        <source>Medium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="403"/>
+        <source>High</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="411"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="422"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="427"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="435"/>
+        <source>Units</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="446"/>
+        <source>m/°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="451"/>
+        <source>ft/°F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="459"/>
+        <source>Dive mode color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="470"/>
+        <source>Standard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="475"/>
+        <source>Red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="480"/>
+        <source>Green</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="485"/>
+        <source>Blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="493"/>
+        <source>Salinity (0-5%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="513"/>
+        <source>Sync dive computer time with PC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="520"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="537"/>
+        <source>230LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="542"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="547"/>
+        <source>390LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="552"/>
+        <source>440LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <source>820LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="594"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="727"/>
+        <source>%O2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="642"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="722"/>
+        <source>%He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="732"/>
+        <source>Type</source>
+        <translation>類型</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="652"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="737"/>
+        <source>Change depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="657"/>
+        <source>Gas 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
+        <source>Gas 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <source>Gas 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="672"/>
+        <source>Gas 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="677"/>
+        <source>Gas 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="742"/>
+        <source>Dil 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="747"/>
+        <source>Dil 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="752"/>
+        <source>Dil 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="757"/>
+        <source>Dil 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="762"/>
+        <source>Dil 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="807"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="812"/>
+        <source>Change depth [m]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="817"/>
+        <source>SP 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="822"/>
+        <source>SP 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <source>SP 3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="832"/>
+        <source>SP 4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="837"/>
+        <source>SP 5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="272"/>
+        <source>Dive computer details read successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="393"/>
+        <source>Backup Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="419"/>
+        <source>Backup files (*.xml)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="400"/>
+        <source>XML Backup Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="401"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="405"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="406"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="418"/>
+        <source>Restore Dive Computer Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="423"/>
+        <source>XML Restore Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="424"/>
+        <source>An error occurred while restoring the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="431"/>
+        <source>Restore succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="432"/>
+        <source>Your settings have been restored successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="443"/>
+        <source>Select firmware file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="444"/>
+        <source>All files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-ui/models.cpp" line="69"/>
@@ -43,22 +548,90 @@
         <translation>交換於</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="158"/>
+        <location filename="../qt-ui/models.cpp" line="173"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>於此處按下將移除此氣瓶.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="365"/>
+        <location filename="../qt-ui/models.cpp" line="381"/>
         <source>Cylinder cannot be removed</source>
         <translation>氣瓶無法移除</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="366"/>
+        <location filename="../qt-ui/models.cpp" line="382"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation>
     </message>
 </context>
 <context>
+    <name>DiveComponentSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <source>Component selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <source>Which components would you like to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
+        <source>Location</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <source>Suit</source>
+        <translation>防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <source>Divemaster</source>
+        <translation>導潛</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <source>Buddy</source>
+        <translation>潛伴</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <source>Rating</source>
+        <translation>評分</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <source>Visibility</source>
+        <translation>能見度</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <source>Notes</source>
+        <translation>記錄</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <source>Weights</source>
+        <translation>配重</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <source>Cylinders</source>
+        <translation>氣瓶</translation>
+    </message>
+</context>
+<context>
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
@@ -81,22 +654,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Model</source>
         <translation>型號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Device ID</source>
         <translation>裝置 ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1442"/>
         <source>Nickname</source>
         <translation>別名</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>點擊這裡移除此潛水電腦。</translation>
     </message>
@@ -122,14 +695,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="1253"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="53"/>
@@ -137,87 +702,87 @@
         <translation>顯示搜尋盒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="707"/>
+        <location filename="../qt-ui/divelistview.cpp" line="716"/>
         <source>Expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="708"/>
+        <location filename="../qt-ui/divelistview.cpp" line="717"/>
         <source>Collapse all</source>
         <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="718"/>
         <source>Collapse others</source>
         <translation>摺疊其它</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="720"/>
         <source>Remove dive(s) from trip</source>
         <translation>從旅程中移除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="712"/>
+        <location filename="../qt-ui/divelistview.cpp" line="721"/>
         <source>Create new trip above</source>
         <translation>設定為新的旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="726"/>
+        <location filename="../qt-ui/divelistview.cpp" line="735"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>於上方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="728"/>
+        <location filename="../qt-ui/divelistview.cpp" line="737"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>於下方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="732"/>
+        <location filename="../qt-ui/divelistview.cpp" line="741"/>
         <source>Merge trip with trip above</source>
         <translation>與上方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="733"/>
+        <location filename="../qt-ui/divelistview.cpp" line="742"/>
         <source>Merge trip with trip below</source>
         <translation>與下方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="737"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Delete dive(s)</source>
         <translation>刪除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="739"/>
+        <location filename="../qt-ui/divelistview.cpp" line="748"/>
         <source>Mark dive(s) invalid</source>
         <translation>標示為無效的潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="743"/>
+        <location filename="../qt-ui/divelistview.cpp" line="752"/>
         <source>Merge selected dives</source>
         <translation>合併所選擇的潛水記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="745"/>
+        <location filename="../qt-ui/divelistview.cpp" line="754"/>
         <source>Renumber dive(s)</source>
         <translation>為潛水記錄(多支)重新編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="746"/>
+        <location filename="../qt-ui/divelistview.cpp" line="755"/>
         <source>Shift times</source>
         <translation>移動時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="747"/>
+        <location filename="../qt-ui/divelistview.cpp" line="756"/>
         <source>Load images</source>
         <translation>載入影像</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Open image files</source>
         <translation>開啟影像檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="777"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -261,13 +826,13 @@
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="121"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="208"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="211"/>
         <source>Selected dives</source>
         <translation>選擇的潛水</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="131"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="234"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="240"/>
         <source>All dives</source>
         <translation>所有潛水</translation>
     </message>
@@ -277,11 +842,6 @@
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="221"/>
-        <source>Minimum Javascript</source>
-        <translation>精簡 Javascript</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
         <translation>匯出潛水日誌檔案</translation>
@@ -302,143 +862,148 @@
         <translation>Subsurface numbers</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="244"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="224"/>
+        <source>Export Yearly Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="250"/>
         <source>Export list only</source>
         <translation>只匯出清單</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="257"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="263"/>
         <source>Style options</source>
         <translation>樣式選項</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="269"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="285"/>
         <source>Font size</source>
         <translation>字型大小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="290"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="296"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="295"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="301"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="311"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="310"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="316"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="315"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="321"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="320"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="326"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="328"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
         <source>Theme</source>
         <translation>主題</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="339"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="345"/>
         <source>Light</source>
         <translation>Light</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="350"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="192"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="239"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF 檔案 (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="196"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="243"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV 檔案 (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="59"/>
+        <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="61"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values that include the most relevant information of the dive profile.</source>
         <translation>逗號分隔數值，並包含相對應潛水剖面的資訊。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="63"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>傳送潛水資料至 divelogs.de 網站。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="65"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <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="67"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface 原生 XML 格式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="191"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="238"/>
         <source>Export UDDF file as</source>
         <translation>匯出 UDDF 檔案為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="195"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="242"/>
         <source>Export CSV file as</source>
         <translation>匯出 CSV 檔案為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="200"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="247"/>
         <source>Export world map</source>
         <translation>匯出地圖</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="201"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="217"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>HTML files (*.html)</source>
         <translation>HTML 檔案 (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="205"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="252"/>
         <source>Export Subsurface XML</source>
         <translation>匯出 Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="206"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="253"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML 檔案 (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="216"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export HTML files as</source>
         <translation>匯出 HTML 檔案為</translation>
     </message>
@@ -628,42 +1193,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="139"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="643"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="677"/>
         <source>Final depth</source>
         <translation>最後深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="645"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="679"/>
         <source>Run time</source>
         <translation>持續時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="647"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="681"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="649"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="683"/>
         <source>Used gas</source>
         <translation>使用氣量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="651"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="685"/>
         <source>CC set point</source>
         <translation>密閉式循環設定點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="974"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1018"/>
         <source>Discard the plan?</source>
         <translation>取消這次計畫?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="975"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1019"/>
         <source>You are about to discard your plan.</source>
         <translation>您將要放棄你的計劃.</translation>
     </message>
@@ -671,17 +1236,17 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="258"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
         <source>Dive planner points</source>
         <translation>潛水計畫指示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="262"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
         <source>Available gases</source>
         <translation>可用氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="285"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
         <source>Add dive data point</source>
         <translation>新增潛水資料點</translation>
     </message>
@@ -762,67 +1327,97 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1296"/>
+        <location filename="../qt-ui/models.cpp" line="1315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1299"/>
+        <location filename="../qt-ui/models.cpp" line="1318"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1321"/>
+        <source>Rating</source>
+        <translation>評分</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1305"/>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1308"/>
-        <source>Mins</source>
-        <translation>Mins</translation>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1317"/>
+        <location filename="../qt-ui/models.cpp" line="1336"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1320"/>
+        <location filename="../qt-ui/models.cpp" line="1339"/>
         <source>Cyl</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1332"/>
+        <location filename="../qt-ui/models.cpp" line="1342"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1347"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1353"/>
         <source>Max CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1335"/>
+        <location filename="../qt-ui/models.cpp" line="1356"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1314"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../qt-ui/models.cpp" line="1324"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1326"/>
-        <source>SAC</source>
-        <translation>耗氣率</translation>
+        <location filename="../qt-ui/models.cpp" line="1327"/>
+        <source>Duration</source>
+        <translation>區間</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1330"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="1333"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1329"/>
+        <location filename="../qt-ui/models.cpp" line="1350"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
@@ -830,95 +1425,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="112"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
         <source>no dives were selected</source>
         <translation>未選取任何潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>建立 zip 壓縮檔上傳失敗: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
         <source>cannot create temporary file: %s</source>
         <translation>無法建立暫存檔案: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="167"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>internal error: %s</source>
         <translation>內部錯誤: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="183"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
         <source>internal error</source>
         <translation>內部錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="643"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="674"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
         <source>Uploading dive list...</source>
         <translation>上傳潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="706"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
         <source>Downloading dive list...</source>
         <translation>下載潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
         <source>Downloading %1 dives...</source>
         <translation>下載 %1 潛水...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="799"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>Download finished - %1</source>
         <translation>下載結束 - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="816"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
         <source>Corrupted download</source>
         <translation>中斷下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>此存檔無法被開啟:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
         <source>Upload failed</source>
         <translation>上傳失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="859"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
         <source>Upload successful</source>
         <translation>上傳成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
         <source>Login failed</source>
         <translation>登入失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
         <source>Cannot parse response</source>
         <translation>回覆無法解析</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
         <source>Error: %1</source>
         <translation>錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="843"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
         <source>Upload finished</source>
         <translation>上傳結束</translation>
     </message>
@@ -948,32 +1543,32 @@
         <translation>搜索Uemis潛水設備</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="326"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>選擇記錄檔供潛水電腦下載日誌檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="325"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="327"/>
         <source>Log files (*.log)</source>
         <translation>記錄檔 (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="340"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="342"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="341"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="343"/>
         <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="352"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="354"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>選擇檔案供潛水電腦記錄傾印資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="355"/>
         <source>Dump files (*.bin)</source>
         <translation>傾印檔 (*bin)</translation>
     </message>
@@ -1037,6 +1632,24 @@
         <source>Save libdivecomputer dumpfile</source>
         <translation>儲存 libdivecomputer 傾印檔案</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>FirmwareUpdateThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="536"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="541"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>GlobeGPS</name>
@@ -1050,7 +1663,7 @@
     <name>MainTab</name>
     <message>
         <location filename="../qt-ui/maintab.ui" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="468"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
@@ -1091,27 +1704,27 @@
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="435"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
         <source>Dive notes</source>
         <translation>潛水筆記</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
         <location filename="../qt-ui/maintab.ui" line="613"/>
-        <location filename="../qt-ui/maintab.cpp" line="251"/>
+        <location filename="../qt-ui/maintab.cpp" line="258"/>
         <source>Air temp.</source>
         <translation>氣溫</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="79"/>
         <location filename="../qt-ui/maintab.ui" line="632"/>
-        <location filename="../qt-ui/maintab.cpp" line="252"/>
+        <location filename="../qt-ui/maintab.cpp" line="259"/>
         <source>Water temp.</source>
         <translation>水溫</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="88"/>
-        <location filename="../qt-ui/maintab.cpp" line="461"/>
+        <location filename="../qt-ui/maintab.cpp" line="469"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -1258,67 +1871,61 @@
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="248"/>
+        <location filename="../qt-ui/maintab.cpp" line="255"/>
         <source>Air temp. [%1]</source>
         <translation>氣溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="249"/>
+        <location filename="../qt-ui/maintab.cpp" line="256"/>
         <source>Water temp. [%1]</source>
         <translation>水溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="285"/>
+        <location filename="../qt-ui/maintab.cpp" line="292"/>
         <source>This trip is being edited.</source>
         <translation>此旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="291"/>
+        <location filename="../qt-ui/maintab.cpp" line="299"/>
         <source>Multiple dives are being edited.</source>
         <translation>此些旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="293"/>
+        <location filename="../qt-ui/maintab.cpp" line="301"/>
         <source>This dive is being edited.</source>
         <translation>此潛水已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="406"/>
-        <location filename="../qt-ui/maintab.cpp" line="430"/>
+        <location filename="../qt-ui/maintab.cpp" line="414"/>
+        <location filename="../qt-ui/maintab.cpp" line="438"/>
         <source>Trip notes</source>
         <translation>旅程筆記</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="428"/>
+        <location filename="../qt-ui/maintab.cpp" line="436"/>
         <source>Trip location</source>
         <translation>旅程位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="482"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
-        <location filename="../qt-ui/maintab.cpp" line="523"/>
-        <location filename="../qt-ui/maintab.cpp" line="524"/>
-        <location filename="../qt-ui/maintab.cpp" line="525"/>
+        <location filename="../qt-ui/maintab.cpp" line="502"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
+        <location filename="../qt-ui/maintab.cpp" line="538"/>
+        <location filename="../qt-ui/maintab.cpp" line="542"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="484"/>
-        <source>unknown</source>
-        <translation>未知</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.cpp" line="521"/>
+        <location filename="../qt-ui/maintab.cpp" line="531"/>
         <source>Deepest dive</source>
         <translation>最深的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="522"/>
+        <location filename="../qt-ui/maintab.cpp" line="532"/>
         <source>Shallowest dive</source>
         <translation>最淺的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="585"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -1327,17 +1934,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="589"/>
         <source> and </source>
         <translation>與</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="825"/>
+        <location filename="../qt-ui/maintab.cpp" line="846"/>
         <source>Discard the changes?</source>
         <translation>取消變更？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="826"/>
+        <location filename="../qt-ui/maintab.cpp" line="847"/>
         <source>You are about to discard your changes.</source>
         <translation>您將要放棄您的變更。</translation>
     </message>
@@ -1345,82 +1952,97 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="672"/>
+        <location filename="../qt-ui/mainwindow.ui" line="263"/>
         <source>&amp;File</source>
         <translation>檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../qt-ui/mainwindow.ui" line="681"/>
         <source>Toggle pHe graph</source>
-        <translation>切換 pHe 圖表</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="154"/>
+        <location filename="../qt-ui/mainwindow.ui" line="717"/>
         <source>Toggle calculating all tissues</source>
-        <translation>切換計算所有的組織</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../qt-ui/mainwindow.ui" line="693"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>切換 DC 回報的上限深度</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../qt-ui/mainwindow.ui" line="705"/>
         <source>Toggle calculated ceiling</source>
-        <translation>切換計算的上限深度</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="238"/>
+        <location filename="../qt-ui/mainwindow.ui" line="777"/>
         <source>Toggle NDL, TTS</source>
-        <translation>切換 NDL, TTS</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../qt-ui/mainwindow.ui" line="729"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>切換以每次增加 3m 計算的上限深度</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="290"/>
+        <location filename="../qt-ui/mainwindow.ui" line="640"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="645"/>
+        <source>Re-plan &amp;dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="657"/>
+        <source>Toggle pO2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="669"/>
+        <source>Toggle pN2 Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="741"/>
         <source>Toggle heart rate</source>
-        <translation>切換心跳率</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../qt-ui/mainwindow.ui" line="753"/>
         <source>Toggle MOD</source>
-        <translation>切換 MOD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="342"/>
+        <location filename="../qt-ui/mainwindow.ui" line="765"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>切換 EAD, END, EADD</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="368"/>
+        <location filename="../qt-ui/mainwindow.ui" line="789"/>
         <source>Toggle SAC rate</source>
-        <translation>切換 SAC 率</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="801"/>
         <source>Toggle ruler</source>
-        <translation>切換規則</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="501"/>
-        <source>Toggle viewing picture thumbnails</source>
-        <translation>切換顯示照片縮圖</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../qt-ui/mainwindow.ui" line="184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;潛水計畫細節&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="609"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>Print</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../qt-ui/mainwindow.ui" line="233"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1433,454 +2055,450 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../qt-ui/mainwindow.ui" line="286"/>
         <source>&amp;Log</source>
         <translation>日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="705"/>
+        <location filename="../qt-ui/mainwindow.ui" line="301"/>
         <source>&amp;View</source>
         <translation>檢視</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="721"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
         <source>&amp;Help</source>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
         <source>&amp;Import</source>
         <translation>匯入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="744"/>
+        <location filename="../qt-ui/mainwindow.ui" line="340"/>
         <source>&amp;New logbook</source>
         <translation>建立新日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="747"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>New</source>
         <translation>建立</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="750"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="755"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>&amp;Open logbook</source>
         <translation>開啟日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="758"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="766"/>
+        <location filename="../qt-ui/mainwindow.ui" line="362"/>
         <source>&amp;Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="769"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="772"/>
+        <location filename="../qt-ui/mainwindow.ui" line="368"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="777"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
         <source>Sa&amp;ve as</source>
         <translation>另存為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="780"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
         <source>Save as</source>
         <translation>另存為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="783"/>
+        <location filename="../qt-ui/mainwindow.ui" line="379"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="788"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
         <source>&amp;Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="791"/>
+        <location filename="../qt-ui/mainwindow.ui" line="387"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="794"/>
+        <location filename="../qt-ui/mainwindow.ui" line="390"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="807"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
         <source>P&amp;references</source>
         <translation>設置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>自 Subsurface 網路服務匯入 GPS 資料</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="890"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <source>&amp;Copy dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <source>Ctrl+C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <source>&amp;Paste dive components</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <source>Ctrl+V</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="502"/>
         <source>&amp;Profile</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="898"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
         <source>&amp;Info</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="906"/>
+        <location filename="../qt-ui/mainwindow.ui" line="518"/>
         <source>&amp;All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="922"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
         <source>&amp;Next DC</source>
         <translation>下一個 DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="930"/>
+        <location filename="../qt-ui/mainwindow.ui" line="542"/>
         <source>&amp;About Subsurface</source>
         <translation>關於 Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="946"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
         <source>&amp;Globe</source>
         <translation>Globe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="968"/>
+        <location filename="../qt-ui/mainwindow.ui" line="580"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="973"/>
+        <location filename="../qt-ui/mainwindow.ui" line="585"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>自 Divelogs.de 匯入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="981"/>
+        <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <source>&amp;Full screen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="984"/>
+        <location filename="../qt-ui/mainwindow.ui" line="596"/>
         <source>Toggle full screen</source>
         <translation>切換為全螢幕</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1012"/>
+        <location filename="../qt-ui/mainwindow.ui" line="624"/>
         <source>&amp;Check for updates</source>
         <translation>檢查有無更新</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1017"/>
+        <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <source>&amp;Export</source>
         <translation>匯出</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1020"/>
+        <location filename="../qt-ui/mainwindow.ui" line="632"/>
         <source>Export Dive Logs</source>
         <translation>匯出潛水日誌</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="1023"/>
+        <location filename="../qt-ui/mainwindow.ui" line="635"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="394"/>
-        <source>Rescale depth axis</source>
-        <translation>重新調節深度坐標軸</translation>
+        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <source>Scale Graph</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="825"/>
+        <source>Toggle Pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="837"/>
+        <source>Toggle Tank Bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="799"/>
+        <location filename="../qt-ui/mainwindow.ui" line="395"/>
         <source>&amp;Print</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="810"/>
+        <location filename="../qt-ui/mainwindow.ui" line="406"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="818"/>
+        <location filename="../qt-ui/mainwindow.ui" line="414"/>
         <source>&amp;Quit</source>
         <translation>結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="829"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>Import from &amp;dive computer</source>
         <translation>從潛水電腦匯入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="840"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="853"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="858"/>
+        <location filename="../qt-ui/mainwindow.ui" line="470"/>
         <source>&amp;Renumber</source>
         <translation>重新編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="861"/>
+        <location filename="../qt-ui/mainwindow.ui" line="473"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="877"/>
+        <location filename="../qt-ui/mainwindow.ui" line="489"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="957"/>
+        <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="802"/>
+        <location filename="../qt-ui/mainwindow.ui" line="398"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="131"/>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
-        <location filename="../qt-ui/mainwindow.ui" line="186"/>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
-        <location filename="../qt-ui/mainwindow.ui" line="241"/>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
-        <location filename="../qt-ui/mainwindow.ui" line="371"/>
-        <location filename="../qt-ui/mainwindow.ui" line="397"/>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
-        <location filename="../qt-ui/mainwindow.ui" line="449"/>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
-        <location filename="../qt-ui/mainwindow.ui" line="504"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
-        <source>Toggle pO₂ Graph</source>
-        <translation>切換 pO₂ 圖表</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
-        <source>Toggle pN₂ Graph</source>
-        <translation>切換 pN₂ 圖表</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="821"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="832"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="845"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>&amp;Edit device names</source>
         <translation>編輯裝置名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="850"/>
+        <location filename="../qt-ui/mainwindow.ui" line="446"/>
         <source>&amp;Add dive</source>
         <translation>新增潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="869"/>
+        <location filename="../qt-ui/mainwindow.ui" line="481"/>
         <source>Auto &amp;group</source>
         <translation>自動群組</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="874"/>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
         <source>&amp;Yearly statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="882"/>
+        <location filename="../qt-ui/mainwindow.ui" line="494"/>
         <source>&amp;Dive list</source>
         <translation>潛水列表</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="885"/>
+        <location filename="../qt-ui/mainwindow.ui" line="497"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="893"/>
+        <location filename="../qt-ui/mainwindow.ui" line="505"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="901"/>
+        <location filename="../qt-ui/mainwindow.ui" line="513"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="909"/>
+        <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="914"/>
+        <location filename="../qt-ui/mainwindow.ui" line="526"/>
         <source>P&amp;revious DC</source>
         <translation>上一個 DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="917"/>
+        <location filename="../qt-ui/mainwindow.ui" line="529"/>
         <source>Left</source>
         <translation>左邊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="925"/>
+        <location filename="../qt-ui/mainwindow.ui" line="537"/>
         <source>Right</source>
         <translation>右邊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="938"/>
+        <location filename="../qt-ui/mainwindow.ui" line="550"/>
         <source>User &amp;manual</source>
         <translation>使用者說明</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="941"/>
+        <location filename="../qt-ui/mainwindow.ui" line="553"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="949"/>
+        <location filename="../qt-ui/mainwindow.ui" line="561"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="954"/>
+        <location filename="../qt-ui/mainwindow.ui" line="566"/>
         <source>P&amp;lan dive</source>
         <translation>計畫潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="962"/>
+        <location filename="../qt-ui/mainwindow.ui" line="574"/>
         <source>&amp;Import log files</source>
         <translation>匯入日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="965"/>
+        <location filename="../qt-ui/mainwindow.ui" line="577"/>
         <source>Import divelog files from other applications</source>
         <translation>從其他程序導入潛水檔案文件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="987"/>
+        <location filename="../qt-ui/mainwindow.ui" line="599"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="191"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="205"/>
         <source>Open file</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="279"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="274"/>
         <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="386"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
         <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="419"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="426"/>
         <source>Print runtime table</source>
         <translation>列印操作表格</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
-        <source>Yearly statistics</source>
-        <translation>年統計</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="705"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <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="707"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="727"/>
         <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="712"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="732"/>
         <source>Save changes?</source>
         <translation>儲存變更?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1081"/>
         <source>Save file as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1192"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1205"/>
         <source>Open dive log file</source>
         <translation>打開潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1193"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1206"/>
         <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source>
         <translation>潛水日誌檔案 (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML 檔案 (*.xml);;UDDF/UDCF 檔案 (*.uddf *.udcf);;JDiveLog 檔案 (*.jlb);;Suunto 檔案 (*.sde *.db);;CSV 檔案 (*.csv);;所有檔案 (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="713"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="733"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>如果不進行儲存, 所做變更將會遺失.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="251"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="386"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="381"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="188"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1052"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="202"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1065"/>
         <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="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1082"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1218"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1231"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>請在嘗試其他編輯時先完成當前編輯</translation>
     </message>
@@ -1888,380 +2506,392 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="459"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="472"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="460"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="473"/>
         <source>Last stop at 20ft</source>
         <translation>上一次在20英呎停留</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="461"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="474"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="462"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="475"/>
         <source>20ft to surface</source>
         <translation>水面下 20 英尺</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="464"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="477"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="465"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="478"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="466"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="479"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="467"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>6m to surface</source>
         <translation>水面下 6m</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="484"/>
+        <source>cuft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="83"/>
         <source>Defaults</source>
         <translation>預設值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="93"/>
         <source>Units</source>
         <translation>單位</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="103"/>
         <source>Graph</source>
         <translation>圖表</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="113"/>
         <source>Language</source>
         <translation>語言</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="123"/>
         <source>Network</source>
         <translation>網路</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="165"/>
         <source>Font size</source>
         <translation>字體大小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="180"/>
+        <location filename="../qt-ui/preferences.ui" line="178"/>
         <source>Dives</source>
         <translation>潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="198"/>
+        <location filename="../qt-ui/preferences.ui" line="196"/>
         <source>Use default</source>
         <translation>使用預設</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="206"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="257"/>
+        <location filename="../qt-ui/preferences.ui" line="255"/>
         <source>Animations</source>
         <translation>動畫演示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="261"/>
         <source>Speed</source>
         <translation>速度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="314"/>
         <source>Clear all settings</source>
         <translation>清除所有設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
+        <location filename="../qt-ui/preferences.ui" line="320"/>
         <source>Reset all settings to their default value</source>
         <translation>使用預設值重置所有設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <location filename="../qt-ui/preferences.ui" line="349"/>
         <source>System</source>
         <translation>系統</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
+        <location filename="../qt-ui/preferences.ui" line="356"/>
         <source>Metric</source>
         <translation>公制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <location filename="../qt-ui/preferences.ui" line="366"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <location filename="../qt-ui/preferences.ui" line="376"/>
         <source>Personalize</source>
         <translation>個人化</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
+        <location filename="../qt-ui/preferences.ui" line="400"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="409"/>
+        <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="417"/>
         <source>feet</source>
         <translation>feet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="436"/>
+        <location filename="../qt-ui/preferences.ui" line="434"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="444"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="463"/>
+        <location filename="../qt-ui/preferences.ui" line="461"/>
         <source>liter</source>
         <translation>liter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
+        <location filename="../qt-ui/preferences.ui" line="471"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="490"/>
+        <location filename="../qt-ui/preferences.ui" line="488"/>
         <source>celsius</source>
         <translation>攝氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="498"/>
         <source>fahrenheit</source>
         <translation>華氏</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="517"/>
+        <location filename="../qt-ui/preferences.ui" line="515"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="782"/>
+        <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>System default</source>
         <translation>系統預設</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="821"/>
+        <location filename="../qt-ui/preferences.ui" line="831"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="827"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
         <source>Proxy type</source>
         <translation>Proxy 種類</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="840"/>
+        <location filename="../qt-ui/preferences.ui" line="850"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="866"/>
+        <location filename="../qt-ui/preferences.ui" line="876"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="892"/>
+        <location filename="../qt-ui/preferences.ui" line="902"/>
         <source>Requires authentication</source>
         <translation>需要認證</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="912"/>
+        <location filename="../qt-ui/preferences.ui" line="922"/>
         <source>Username</source>
         <translation>使用者名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="935"/>
+        <location filename="../qt-ui/preferences.ui" line="945"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="812"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="427"/>
         <source>Pressure</source>
         <translation>壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="151"/>
+        <location filename="../qt-ui/preferences.ui" line="149"/>
         <source>Lists and tables</source>
         <translation>列表與表單</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
+        <location filename="../qt-ui/preferences.ui" line="184"/>
         <source>Default dive log file</source>
         <translation>預設潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../qt-ui/preferences.ui" line="215"/>
         <source>Display invalid</source>
         <translation>顯示無效</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="234"/>
+        <location filename="../qt-ui/preferences.ui" line="232"/>
         <source>Default cylinder</source>
         <translation>預設氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../qt-ui/preferences.ui" line="238"/>
         <source>Use default cylinder</source>
         <translation>使用的預設氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="290"/>
+        <location filename="../qt-ui/preferences.ui" line="288"/>
         <source>Subsurface web service</source>
         <translation>Subsurface 網路服務</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
+        <location filename="../qt-ui/preferences.ui" line="294"/>
         <source>Default user ID</source>
         <translation>預設的使用者 ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="304"/>
         <source>Save user ID locally?</source>
         <translation>是否儲存使用者 ID 於本機？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="454"/>
         <source>Volume</source>
         <translation>容量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="481"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="525"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="542"/>
+        <location filename="../qt-ui/preferences.ui" line="540"/>
         <source>Time units</source>
         <translation>時間單位</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="555"/>
+        <location filename="../qt-ui/preferences.ui" line="553"/>
         <source>Minutes</source>
         <translation>分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="563"/>
         <source>Seconds</source>
         <translation>秒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
+        <location filename="../qt-ui/preferences.ui" line="595"/>
         <source>Show</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="766"/>
+        <location filename="../qt-ui/preferences.ui" line="776"/>
         <source>GFLow at max depth</source>
         <translation>最大深度的 GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="726"/>
+        <location filename="../qt-ui/preferences.ui" line="736"/>
         <source>Misc</source>
         <translation>其它</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../qt-ui/preferences.ui" line="12"/>
         <source>Preferences</source>
         <translation>環境設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="548"/>
+        <location filename="../qt-ui/preferences.ui" line="546"/>
         <source>Ascent/descent speed denominator</source>
         <translation>上升／下降速度分母</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="608"/>
+        <location filename="../qt-ui/preferences.ui" line="606"/>
         <source>Threshold when showing pO₂</source>
         <translation>顯示 pO₂ 時的臨界值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="629"/>
+        <location filename="../qt-ui/preferences.ui" line="630"/>
         <source>Threshold when showing pN₂</source>
         <translation>顯示 pN₂ 時的臨界值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="650"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
         <source>Threshold when showing pHe</source>
         <translation>顯示 pHe 時的臨界值</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="671"/>
+        <location filename="../qt-ui/preferences.ui" line="678"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>顯示 MOD 時最大的 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="692"/>
+        <location filename="../qt-ui/preferences.ui" line="702"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>畫出潛水設備回報的警戒上限深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="703"/>
+        <location filename="../qt-ui/preferences.ui" line="713"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>在裝備分頁中顯示未使用的氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="724"/>
         <source>Show average depth</source>
         <translation>顯示平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="732"/>
+        <location filename="../qt-ui/preferences.ui" line="742"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="749"/>
+        <location filename="../qt-ui/preferences.ui" line="759"/>
         <source>GFHigh</source>
         <translation>GFhigh</translation>
     </message>
@@ -2286,32 +2916,32 @@ p, li { white-space: pre-wrap; }
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="247"/>
+        <location filename="../qt-ui/preferences.cpp" line="261"/>
         <source>Restart required</source>
         <translation>需要重新啟動</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="248"/>
+        <location filename="../qt-ui/preferences.cpp" line="262"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>您必須重新啟動 Subsurface 來正確載入新的語言。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
+        <location filename="../qt-ui/preferences.cpp" line="425"/>
         <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="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="384"/>
+        <location filename="../qt-ui/preferences.cpp" line="411"/>
         <source>Open default log file</source>
         <translation>開啟預設的日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="397"/>
+        <location filename="../qt-ui/preferences.cpp" line="424"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
@@ -2333,49 +2963,49 @@ p, li { white-space: pre-wrap; }
         <source>Print</source>
         <translation>列印</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/printdialog.cpp" line="75"/>
-        <source>Subsurface cannot find installed printers on this system!</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Dive#</source>
         <translation>潛水編號 #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="32"/>
         <source>Master</source>
         <translation>專長</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="33"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="34"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <source>Subsurface cannot find a usable printer on this system!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -2438,72 +3068,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1901"/>
+        <location filename="../qt-ui/models.cpp" line="1922"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1906"/>
+        <location filename="../qt-ui/models.cpp" line="1927"/>
         <source>Dive #%1 - %2</source>
         <translation>潛水 #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1909"/>
+        <location filename="../qt-ui/models.cpp" line="1930"/>
         <source>Max depth: %1 %2</source>
         <translation>最大深度: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1916"/>
+        <location filename="../qt-ui/models.cpp" line="1937"/>
         <source>Duration: %1 min</source>
         <translation>區間: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1921"/>
+        <location filename="../qt-ui/models.cpp" line="1942"/>
         <source>Gas used:</source>
         <translation>消耗氣體: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1923"/>
+        <location filename="../qt-ui/models.cpp" line="1944"/>
         <source>Tags:</source>
         <translation>標籤:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1925"/>
+        <location filename="../qt-ui/models.cpp" line="1946"/>
         <source>SAC:</source>
         <translation>耗氣率: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1927"/>
+        <location filename="../qt-ui/models.cpp" line="1948"/>
         <source>Weights:</source>
         <translation>配重:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1932"/>
+        <location filename="../qt-ui/models.cpp" line="1953"/>
         <source>Notes:</source>
         <translation>記錄:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1939"/>
+        <location filename="../qt-ui/models.cpp" line="1960"/>
         <source>Divemaster:</source>
         <translation>導潛:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1941"/>
+        <location filename="../qt-ui/models.cpp" line="1962"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1943"/>
+        <location filename="../qt-ui/models.cpp" line="1964"/>
         <source>Suit:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1945"/>
+        <location filename="../qt-ui/models.cpp" line="1966"/>
         <source>Viz:</source>
         <translation>能見度:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1947"/>
+        <location filename="../qt-ui/models.cpp" line="1968"/>
         <source>Rating:</source>
         <translation>評分:</translation>
     </message>
@@ -2511,82 +3141,82 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="512"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="541"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="892"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
         <source>Make first divecomputer</source>
         <translation>設定第 1 潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="894"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="977"/>
         <source>Delete this divecomputer</source>
         <translation>刪除此潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="901"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="984"/>
         <source>Add gas change</source>
         <translation>增加氣瓶交換</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="912"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="995"/>
         <source>Add bookmark</source>
         <translation>新增書籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="916"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="999"/>
         <source>Remove event</source>
         <translation>移除事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="921"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1004"/>
         <source>Hide similar events</source>
         <translation>隱藏相似事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
         <source>Edit name</source>
         <translation>潛水名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="941"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1024"/>
         <source>Unhide all events</source>
         <translation>取消隱藏所有事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide events</source>
         <translation>隱藏事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="975"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1058"/>
         <source>Hide all %1 events?</source>
         <translation>隱藏所有 %1 事件?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1010"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1093"/>
         <source>Remove the selected event?</source>
         <translation>移除所選擇的事件？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1011"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1094"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1079"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1164"/>
         <source>Edit name of bookmark</source>
         <translation>編輯書籤名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1080"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
         <source>Custom name:</source>
         <translation>自訂名稱:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -2599,7 +3229,7 @@ p, li { white-space: pre-wrap; }
         <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="214"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
         <source>Remove this point</source>
         <translation>移除此點</translation>
     </message>
@@ -2624,72 +3254,85 @@ p, li { white-space: pre-wrap; }
         <translation>最高</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="288"/>
+        <location filename="../qt-ui/globe.cpp" line="289"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="472"/>
+        <location filename="../qt-ui/models.cpp" line="488"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="473"/>
+        <location filename="../qt-ui/models.cpp" line="489"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="497"/>
+        <location filename="../qt-ui/models.cpp" line="513"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="498"/>
+        <location filename="../qt-ui/models.cpp" line="514"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="537"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="538"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="562"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="563"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
         <source>Invalid response from server</source>
         <translation>主機回傳不正確的回應.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="535"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
         <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="581"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
         <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="588"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>異常的 XML 回應. 第 %1 行: %2</translation>
     </message>
 </context>
 <context>
+    <name>ReadSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="304"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="309"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
@@ -2849,47 +3492,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="343"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
         <source>Webservice</source>
         <translation>網頁服務</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="407"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
         <source>Connecting...</source>
         <translation>連結...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
         <source>Download finished</source>
         <translation>下載結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="440"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
         <source>Download error: %1</source>
         <translation>下載失敗: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
         <source>Connection error: </source>
         <translation>連結錯誤:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="459"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
         <source>Download successful</source>
         <translation>下載成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
         <source>Invalid user identifier!</source>
         <translation>錯誤的使用者 Id !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
         <source>Enter User ID and click Download</source>
         <translation>輸入使用者 ID 並點選下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="456"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
         <source>Cannot parse response!</source>
         <translation>回覆無法解析!</translation>
     </message>
@@ -2905,17 +3548,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="863"/>
+        <location filename="../qt-ui/models.cpp" line="879"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2951,22 +3594,32 @@ p, li { white-space: pre-wrap; }
         <translation>請確認您的網路連線。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="55"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="59"/>
         <source>You are using the latest version of subsurface.</source>
         <translation>您正在使用最新版的 Subsurface。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="57"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="61"/>
         <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>有新版 Subsurface 可供使用。&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="60"/>
-        <source>&lt;b&gt;A new version of subsurface is available.&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</source>
-        <translation>&lt;b&gt;有新版 Subsurface 可供使用。&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;%1</translation>
+        <location filename="../qt-ui/updatemanager.cpp" line="68"/>
+        <source>A new version of subsurface is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="69"/>
+        <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="63"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="75"/>
+        <source>Newest release version is </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/updatemanager.cpp" line="76"/>
         <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>
@@ -3048,80 +3701,85 @@ p, li { white-space: pre-wrap; }
         <translation>以下有關您的系統的資訊將會被傳送。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
         <source>
 Operating System: %1</source>
         <translation>
 作業系統: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU 架構: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
         <source>
 Language: %1</source>
         <translation>
 語言: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="77"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Should we ask you later?</source>
         <translation>是否稍後詢問？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="78"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Don&apos;t ask me again</source>
         <translation>請勿再問我</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask later</source>
         <translation>稍後再詢問</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="99"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Submit user survey.</source>
         <translation>傳送使用者調查。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
         <source>Ask again?</source>
         <translation>再次詢問？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>傳送</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU 架構: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="100"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface 無法傳送使用者調查</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="105"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>The following error occurred:</source>
         <translation>錯誤持續發生:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="106"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
         <source>Please check your internet connection.</source>
         <translation>請確認您的網路連線。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
         <source>Survey successfully submitted.</source>
         <translation>成功傳送調查。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="120"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
         <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>
@@ -3129,12 +3787,12 @@ OS CPU 架構: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="734"/>
+        <location filename="../qt-ui/models.cpp" line="750"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -3182,12 +3840,12 @@ OS CPU 架構: %1</translation>
         <translation>上傳</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="261"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
         <source>Operation timed out</source>
         <translation>操作時間結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="282"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
         <source>Transfering data...</source>
         <translation>移轉資料...</translation>
     </message>
@@ -3195,97 +3853,110 @@ OS CPU 架構: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="387"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="447"/>
+        <location filename="../qt-ui/models.cpp" line="463"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>按此處移除配重系統。</translation>
     </message>
 </context>
 <context>
+    <name>WriteSettingsThread</name>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="502"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="507"/>
+        <source>Could not a establish connection to the dive computer.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1647"/>
+        <location filename="../qt-ui/models.cpp" line="1668"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>年 
  &gt; 月 / 旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1650"/>
+        <location filename="../qt-ui/models.cpp" line="1671"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1653"/>
+        <location filename="../qt-ui/models.cpp" line="1674"/>
         <source>Duration 
  Total</source>
         <translation>區間 
 全部</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1656"/>
+        <location filename="../qt-ui/models.cpp" line="1677"/>
         <source>
 Average</source>
         <translation>
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1659"/>
+        <location filename="../qt-ui/models.cpp" line="1680"/>
         <source>
 Shortest</source>
         <translation>
 最短</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1662"/>
+        <location filename="../qt-ui/models.cpp" line="1683"/>
         <source>
 Longest</source>
         <translation>
 最長</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1665"/>
+        <location filename="../qt-ui/models.cpp" line="1686"/>
         <source>Depth (%1)
  Average</source>
         <translation>深度 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1668"/>
-        <location filename="../qt-ui/models.cpp" line="1677"/>
-        <location filename="../qt-ui/models.cpp" line="1686"/>
+        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1698"/>
+        <location filename="../qt-ui/models.cpp" line="1707"/>
         <source>
 Minimum</source>
         <translation>
 最小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1671"/>
-        <location filename="../qt-ui/models.cpp" line="1680"/>
-        <location filename="../qt-ui/models.cpp" line="1689"/>
+        <location filename="../qt-ui/models.cpp" line="1692"/>
+        <location filename="../qt-ui/models.cpp" line="1701"/>
+        <location filename="../qt-ui/models.cpp" line="1710"/>
         <source>
 Maximum</source>
         <translation>
 最大</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1674"/>
+        <location filename="../qt-ui/models.cpp" line="1695"/>
         <source>SAC (%1)
  Average</source>
         <translation>耗氣率 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1683"/>
+        <location filename="../qt-ui/models.cpp" line="1704"/>
         <source>Temp. (%1)
  Average</source>
         <translation>溫度 (%1)
@@ -3295,87 +3966,86 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="128"/>
+        <location filename="../dive.c" line="129"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="133"/>
-        <location filename="../qt-gui.cpp" line="329"/>
+        <location filename="../dive.c" line="134"/>
+        <location filename="../qt-gui.cpp" line="333"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="137"/>
-        <location filename="../qt-gui.cpp" line="332"/>
+        <location filename="../dive.c" line="138"/>
+        <location filename="../qt-gui.cpp" line="336"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="179"/>
+        <location filename="../dive.c" line="180"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="208"/>
-        <location filename="../qt-gui.cpp" line="211"/>
-        <location filename="../qt-gui.cpp" line="226"/>
+        <location filename="../dive.c" line="217"/>
+        <location filename="../qt-gui.cpp" line="215"/>
+        <location filename="../qt-gui.cpp" line="230"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="213"/>
-        <location filename="../qt-gui.cpp" line="214"/>
-        <location filename="../qt-gui.cpp" line="228"/>
+        <location filename="../dive.c" line="222"/>
+        <location filename="../qt-gui.cpp" line="218"/>
+        <location filename="../qt-gui.cpp" line="232"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="236"/>
+        <location filename="../dive.c" line="245"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="238"/>
+        <location filename="../dive.c" line="247"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="243"/>
+        <location filename="../dive.c" line="252"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../dive.c" line="254"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="264"/>
-        <location filename="../qt-gui.cpp" line="237"/>
-        <location filename="../qt-gui.cpp" line="247"/>
+        <location filename="../dive.c" line="273"/>
+        <location filename="../qt-gui.cpp" line="241"/>
+        <location filename="../qt-gui.cpp" line="251"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="268"/>
-        <location filename="../qt-gui.cpp" line="235"/>
-        <location filename="../qt-gui.cpp" line="245"/>
+        <location filename="../dive.c" line="277"/>
+        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../qt-gui.cpp" line="249"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1284"/>
+        <location filename="../dive.c" line="1344"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) 或 (%s)</translation>
     </message>
     <message>
         <location filename="../divelist.c" line="460"/>
         <location filename="../equipment.c" line="79"/>
-        <location filename="../planner.c" line="1005"/>
-        <location filename="../planner.c" line="1008"/>
-        <location filename="../statistics.c" line="355"/>
+        <location filename="../planner.c" line="995"/>
+        <location filename="../planner.c" line="998"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -3417,229 +4087,229 @@ Maximum</source>
         <translation>CSV 匯入最大支援 %d 欄位.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>none</source>
         <translation>無</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>deco stop</source>
         <translation>減壓停留</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>rbt</source>
         <translation>剩餘滯底時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ascent</source>
         <translation>上升</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>ceiling</source>
         <translation>上限深度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="144"/>
+        <location filename="../libdivecomputer.c" line="151"/>
         <source>workload</source>
         <translation>工作量</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>transmitter</source>
         <translation>發射器</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>violation</source>
         <translation>違反</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>bookmark</source>
         <translation>書籤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>surface</source>
         <translation>水面</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="145"/>
+        <location filename="../libdivecomputer.c" line="152"/>
         <source>safety stop</source>
         <translation>安全停留</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="153"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>gaschange</source>
         <translation>氣瓶更換</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (voluntary)</source>
         <translation>安全停留 (非必要)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="146"/>
+        <location filename="../libdivecomputer.c" line="153"/>
         <source>safety stop (mandatory)</source>
         <translation>安全停留 (強制性)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>deepstop</source>
         <translation>深停留</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>ceiling (safety stop)</source>
         <translation>上限深度 (安全停留)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>divetime</source>
         <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="147"/>
+        <location filename="../libdivecomputer.c" line="154"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>maxdepth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>PO2</source>
         <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>airtime</source>
         <translation>空氣時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="148"/>
+        <location filename="../libdivecomputer.c" line="155"/>
         <source>heading</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>tissue level warning</source>
         <translation>組織等級警告</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="149"/>
+        <location filename="../libdivecomputer.c" line="156"/>
         <source>non stop time</source>
         <translation>無停留時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="173"/>
         <source>invalid event number</source>
         <translation>錯誤的事件編號</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="408"/>
+        <location filename="../libdivecomputer.c" line="415"/>
         <source>Unable to create parser for %s %s</source>
         <translation>無法建立解析 %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="414"/>
+        <location filename="../libdivecomputer.c" line="421"/>
         <source>Error registering the data</source>
         <translation>錯誤的登錄資料</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="422"/>
+        <location filename="../libdivecomputer.c" line="429"/>
         <source>Error parsing the datetime</source>
         <translation>日期時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="438"/>
+        <location filename="../libdivecomputer.c" line="445"/>
         <source>Dive %d: %s</source>
         <translation>潛水 %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="442"/>
+        <location filename="../libdivecomputer.c" line="449"/>
         <source>Error parsing the divetime</source>
         <translation>潛水時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="458"/>
         <source>Error parsing the maxdepth</source>
         <translation>最大深度解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="460"/>
+        <location filename="../libdivecomputer.c" line="467"/>
         <source>Error parsing the gas mix count</source>
         <translation>混合氣體數量解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="472"/>
+        <location filename="../libdivecomputer.c" line="479"/>
         <source>Error obtaining water salinity</source>
         <translation>得到錯誤的海水鹽度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="487"/>
         <source>Error obtaining surface pressure</source>
         <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="488"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the gas mix</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../libdivecomputer.c" line="502"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="639"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="633"/>
+        <location filename="../libdivecomputer.c" line="647"/>
         <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="693"/>
+        <location filename="../libdivecomputer.c" line="707"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="698"/>
+        <location filename="../libdivecomputer.c" line="712"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="719"/>
+        <location filename="../libdivecomputer.c" line="733"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="758"/>
+        <location filename="../libdivecomputer.c" line="772"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="765"/>
+        <location filename="../libdivecomputer.c" line="779"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
@@ -3651,19 +4321,19 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1692"/>
+        <location filename="../parse-xml.c" line="1694"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>無法解析訊息 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1913"/>
+        <location filename="../parse-xml.c" line="1915"/>
         <source>Database query get_events failed.
 </source>
         <translation>資料庫讀取 get_events 失敗.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1920"/>
+        <location filename="../parse-xml.c" line="1922"/>
         <source>Database query get_tags failed.
 </source>
         <translation>數據庫請求get_tags失敗</translation>
@@ -3676,36 +4346,36 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1954"/>
-        <location filename="../parse-xml.c" line="2101"/>
+        <location filename="../parse-xml.c" line="1956"/>
+        <location filename="../parse-xml.c" line="2103"/>
         <source>Database query failed '%s'.
 </source>
         <translation>資料庫要求錯誤 &apos;%s&apos; .
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2065"/>
+        <location filename="../parse-xml.c" line="2067"/>
         <source>Database query get_cylinders failed.
 </source>
         <translation>資料庫讀取  get_cylinders 失敗。
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2072"/>
+        <location filename="../parse-xml.c" line="2074"/>
         <source>Database query get_changes failed.
 </source>
         <translation>資料庫讀取  get_changes 失敗。
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2079"/>
+        <location filename="../parse-xml.c" line="2081"/>
         <source>Database query get_profile_sample failed.
 </source>
         <translation>資料庫讀取  get_profile_sample 失敗。
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2170"/>
+        <location filename="../parse-xml.c" line="2172"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>無法開啟樣式 %s</translation>
     </message>
@@ -3715,136 +4385,136 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="773"/>
+        <location filename="../planner.c" line="762"/>
         <source>Can&apos;t find gas %s</source>
         <translation>無法找到氣體 %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="347"/>
+        <location filename="../planner.c" line="350"/>
         <source>Too many gas mixes</source>
         <translation>太多氣體混合</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="528"/>
+        <location filename="../planner.c" line="517"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION 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>免責聲明 / 警告: 這是使用新發展的 BUHLMANN 演算法, 且使用的潛水計畫僅經過有限次數的測試. 我們強烈建議不要直接使用此處模擬結果做為計畫.  </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="538"/>
+        <location filename="../planner.c" line="527"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="546"/>
+        <location filename="../planner.c" line="535"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>以 GFlow = %d 與 GFhigh = %d 為基礎</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="549"/>
+        <location filename="../planner.c" line="538"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface 潛水計畫</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="553"/>
+        <location filename="../planner.c" line="542"/>
         <source>depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="556"/>
+        <location filename="../planner.c" line="545"/>
         <source>runtime</source>
         <translation>作業時間</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="559"/>
+        <location filename="../planner.c" line="548"/>
         <source>duration</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="562"/>
+        <location filename="../planner.c" line="551"/>
         <source>gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="596"/>
+        <location filename="../planner.c" line="585"/>
         <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="606"/>
+        <location filename="../planner.c" line="595"/>
         <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="617"/>
+        <location filename="../planner.c" line="606"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="620"/>
-        <location filename="../planner.c" line="624"/>
+        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="613"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="640"/>
+        <location filename="../planner.c" line="629"/>
         <source>Switch gas to %s</source>
         <translation>更換氣體至 %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="653"/>
+        <location filename="../planner.c" line="642"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="655"/>
+        <location filename="../planner.c" line="644"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="647"/>
         <source>Gas consumption:</source>
         <translation>氣體消耗:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="540"/>
-        <location filename="../planner.c" line="678"/>
-        <location filename="../planner.c" line="683"/>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="529"/>
+        <location filename="../planner.c" line="667"/>
+        <location filename="../planner.c" line="672"/>
+        <location filename="../planner.c" line="695"/>
         <source>Warning:</source>
         <translation>提醒:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../planner.c" line="668"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>指定的氣瓶氣體超過供給量！</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="673"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>無足夠的預留氣體可供上升使用！</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="686"/>
+        <location filename="../planner.c" line="675"/>
         <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="688"/>
+        <location filename="../planner.c" line="677"/>
         <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="703"/>
+        <location filename="../planner.c" line="692"/>
         <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="1009"/>
+        <location filename="../planner.c" line="999"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1250"/>
+        <location filename="../profile.c" line="955"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -3853,63 +4523,63 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1253"/>
+        <location filename="../profile.c" line="958"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1257"/>
+        <location filename="../profile.c" line="962"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="968"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="971"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1268"/>
+        <location filename="../profile.c" line="973"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1270"/>
+        <location filename="../profile.c" line="975"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="977"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1274"/>
+        <location filename="../profile.c" line="979"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1277"/>
+        <location filename="../profile.c" line="982"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1284"/>
+        <location filename="../profile.c" line="989"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -3918,7 +4588,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1288"/>
+        <location filename="../profile.c" line="993"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -3927,262 +4597,262 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1005"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>安全停留: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1303"/>
+        <location filename="../profile.c" line="1008"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>安全停留: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1013"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1311"/>
+        <location filename="../profile.c" line="1016"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>減壓: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1315"/>
+        <location filename="../profile.c" line="1020"/>
         <source>In deco
 </source>
         <translation>減壓中
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1317"/>
+        <location filename="../profile.c" line="1022"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1025"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1323"/>
+        <location filename="../profile.c" line="1028"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>減壓: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1331"/>
+        <location filename="../profile.c" line="1036"/>
         <source>In deco (calc)
 </source>
         <translation>減壓 (計算)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1333"/>
+        <location filename="../profile.c" line="1038"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (預計)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1041"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1339"/>
+        <location filename="../profile.c" line="1044"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>計算的上限深度 %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1345"/>
+        <location filename="../profile.c" line="1050"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>組織 %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1351"/>
+        <location filename="../profile.c" line="1056"/>
         <source>heartbeat: %d
 </source>
         <translation>心跳: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1353"/>
+        <location filename="../profile.c" line="1058"/>
         <source>bearing: %d
 </source>
         <translation>方位: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1445"/>
+        <location filename="../profile.c" line="1150"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1449"/>
-        <location filename="../profile.c" line="1453"/>
-        <location filename="../profile.c" line="1457"/>
+        <location filename="../profile.c" line="1154"/>
+        <location filename="../profile.c" line="1158"/>
+        <location filename="../profile.c" line="1162"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1461"/>
+        <location filename="../profile.c" line="1166"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1465"/>
+        <location filename="../profile.c" line="1170"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1469"/>
-        <location filename="../profile.c" line="1473"/>
+        <location filename="../profile.c" line="1174"/>
+        <location filename="../profile.c" line="1178"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1480"/>
+        <location filename="../profile.c" line="1185"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="290"/>
+        <location filename="../qt-gui.cpp" line="294"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="433"/>
+        <location filename="../qt-gui.cpp" line="437"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 潛水)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="438"/>
+        <location filename="../qt-gui.cpp" line="442"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 潛水)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>boat</source>
         <translation>船潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>shore</source>
         <translation>岸潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="19"/>
+        <location filename="../dive.c" line="20"/>
         <source>drift</source>
         <translation>放流</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>deep</source>
         <translation>深潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>cavern</source>
         <translation>地洞</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="21"/>
         <source>ice</source>
         <translation>冰潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>wreck</source>
         <translation>沈船</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>cave</source>
         <translation>洞穴</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="22"/>
         <source>altitude</source>
         <translation>高海拔</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>pool</source>
         <translation>泳池</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>lake</source>
         <translation>湖泊</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="23"/>
         <source>river</source>
         <translation>河流</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>night</source>
         <translation>夜潛</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>fresh</source>
         <translation>新進</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="24"/>
         <source>student</source>
         <translation>學生</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>photo</source>
         <translation>照片</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>video</source>
         <translation>影片</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../dive.c" line="25"/>
         <source>instructor</source>
         <translation>教練</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="26"/>
         <source>deco</source>
         <translation>減壓</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="174"/>
+        <location filename="../dive.c" line="175"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -4232,97 +4902,97 @@ EADD: %d%s
         <translation>(無潛水)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sun</source>
         <translation>周日</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Mon</source>
         <translation>周一</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Tue</source>
         <translation>周二</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Wed</source>
         <translation>周三</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Thu</source>
         <translation>周四</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Fri</source>
         <translation>周五</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="79"/>
+        <location filename="../subsurfacestartup.c" line="80"/>
         <source>Sat</source>
         <translation>周六</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jan</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Feb</source>
         <translation>2月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Mar</source>
         <translation>3月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Apr</source>
         <translation>4月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>May</source>
         <translation>5月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="89"/>
         <source>Jun</source>
         <translation>6月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Jul</source>
         <translation>7月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Aug</source>
         <translation>8月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Sep</source>
         <translation>9月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Oct</source>
         <translation>10月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Nov</source>
         <translation>11月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="89"/>
+        <location filename="../subsurfacestartup.c" line="90"/>
         <source>Dec</source>
         <translation>12月</translation>
     </message>
@@ -4357,92 +5027,92 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="383"/>
-        <source>Reading %s %s</source>
-        <translation>讀取 %s %s</translation>
-    </message>
-    <message>
-        <location filename="../uemis-downloader.c" line="403"/>
+        <location filename="../uemis-downloader.c" line="420"/>
         <source>data</source>
         <translation>資料</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="424"/>
-        <source>divelog entry id</source>
-        <translation>潛水記錄連結 id</translation>
+        <location filename="../uemis-downloader.c" line="400"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../uemis-downloader.c" line="441"/>
+        <source>divelog #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="426"/>
-        <source>divespot data id</source>
-        <translation>潛點資料 id</translation>
+        <location filename="../uemis-downloader.c" line="443"/>
+        <source>divespot #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="428"/>
-        <source>more data dive id</source>
-        <translation>更多潛水記錄, 潛水編號 </translation>
+        <location filename="../uemis-downloader.c" line="445"/>
+        <source>details for #</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>wetsuit</source>
         <translation>濕式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>semidry</source>
         <translation>半乾衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="622"/>
+        <location filename="../uemis-downloader.c" line="639"/>
         <source>drysuit</source>
         <translation>乾式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>shorty</source>
         <translation>短袖防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>vest</source>
         <translation>背心</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>long john</source>
         <translation>長約翰式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>jacket</source>
         <translation>夾克式</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>full suit</source>
         <translation>全身式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="623"/>
+        <location filename="../uemis-downloader.c" line="640"/>
         <source>2 pcs full suit</source>
         <translation>2 件式防寒衣</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="624"/>
+        <location filename="../uemis-downloader.c" line="641"/>
         <source>membrane</source>
         <translation>膜組織</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="823"/>
+        <location filename="../uemis-downloader.c" line="840"/>
         <source>Init Communication</source>
         <translation>初始化通訊</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="825"/>
+        <location filename="../uemis-downloader.c" line="842"/>
         <source>Uemis init failed</source>
         <translation>Uemis 初始化失敗</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="836"/>
+        <location filename="../uemis-downloader.c" line="853"/>
         <source>Start download</source>
         <translation>開始下載</translation>
     </message>
@@ -4537,12 +5207,279 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>電池低電量警示</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="319"/>
+        <location filename="../save-html.c" line="399"/>
+        <location filename="../save-html.c" line="482"/>
         <location filename="../worldmap-save.c" line="106"/>
         <source>Can&apos;t open file %s</source>
         <translation>無法開啟檔案 %s</translation>
     </message>
     <message>
+        <location filename="../save-html.c" line="417"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="418"/>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="419"/>
+        <source>Time</source>
+        <translation>時間</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="420"/>
+        <source>Location</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="421"/>
+        <source>Air Temp</source>
+        <translation>氣溫</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="422"/>
+        <source>Water Temp</source>
+        <translation>水溫</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="423"/>
+        <source>dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="424"/>
+        <source>Expand All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="425"/>
+        <source>Collapse All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="426"/>
+        <source>trips</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="427"/>
+        <source>Statistics</source>
+        <translation>統計</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="428"/>
+        <source>Advanced Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="431"/>
+        <source>Rating</source>
+        <translation>評分</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="432"/>
+        <source>Visibility</source>
+        <translation>能見度</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="433"/>
+        <source>Duration</source>
+        <translation>區間</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="434"/>
+        <source>DiveMaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="435"/>
+        <source>Buddy</source>
+        <translation>潛伴</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="436"/>
+        <source>Suit</source>
+        <translation>防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="437"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="438"/>
+        <source>Notes</source>
+        <translation>記錄</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="439"/>
+        <source>Show more details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="442"/>
+        <source>Yearly statistics</source>
+        <translation>年統計</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="443"/>
+        <source>Year</source>
+        <translation>年</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="444"/>
+        <source>Total Time</source>
+        <translation>全部時間</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="445"/>
+        <source>Average Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="446"/>
+        <source>Shortest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="447"/>
+        <source>Longest Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="448"/>
+        <source>Average Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="449"/>
+        <source>Min Depth</source>
+        <translation>最小深度</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="450"/>
+        <source>Max Depth</source>
+        <translation>最大深度</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="451"/>
+        <source>Average SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="452"/>
+        <source>Min SAC</source>
+        <translation>最小 SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="453"/>
+        <source>Max SAC</source>
+        <translation>最大 SAC</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="454"/>
+        <source>Average Temp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="455"/>
+        <source>Min Temp</source>
+        <translation>最低溫度</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="456"/>
+        <source>Max Temp</source>
+        <translation>最高溫度</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="457"/>
+        <source>Back to List</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="460"/>
+        <source>Dive No.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="461"/>
+        <source>Dive profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="462"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="463"/>
+        <source>Dive equipments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="464"/>
+        <location filename="../save-html.c" line="471"/>
+        <source>Type</source>
+        <translation>類型</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="465"/>
+        <source>Size</source>
+        <translation>容量</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="466"/>
+        <source>Work Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="467"/>
+        <source>Start Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="468"/>
+        <source>End Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="469"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="470"/>
+        <source>Weight</source>
+        <translation>重量</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="472"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="473"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="474"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="475"/>
+        <source>Coordinates</source>
+        <translation>座標</translation>
+    </message>
+    <message>
+        <location filename="../save-html.c" line="476"/>
+        <source>Dive Status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../worldmap-save.c" line="36"/>
         <source>Date:</source>
         <translation>日期:</translation>
@@ -4664,37 +5601,43 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>低 GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="285"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
         <source>GF high</source>
         <translation>高 GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="302"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
         <source>Drop to first depth</source>
         <translation>下降至第 1 深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="309"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="316"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>Plan backgas breaks</source>
         <translation>計畫後氣瓶中斷點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="339"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
         <source>Gas options</source>
         <translation>氣體選項</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
         <source>Bottom SAC</source>
         <translation>水底耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
         <source>Deco SAC</source>
         <translation>減壓 SAC</translation>
     </message>
@@ -4709,27 +5652,33 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>減壓 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="442"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
         <source>Dive notes</source>
         <translation>潛水筆記</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="466"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
         <source>Display runtime</source>
         <translation>顯示運作時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="482"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
         <source>Display segment duration</source>
         <translation>顯示分段區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
         <source>Display transitions in deco</source>
         <translation>在減壓中顯示禁飛時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>Verbatim diveplan</source>
         <translation>逐步潛水計畫</translation>
     </message>
@@ -4755,17 +5704,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>水面下 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="463"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>在潛水計畫中，顯示停留的操作時間 (絕對時間) 。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="479"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>在潛水計畫中，顯示停留的時間 (相對時間) 。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>在潛水計畫中，列出禁飛時間或標記為提示</translation>
     </message>