Latest snapshot of translations

German, Finnish, Norwegian, Swedish and Dutch are already mostly done! Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2013-11-29 12:14:25 -0800
committer: Dirk Hohndel <dirk@hohndel.org> 2013-11-29 12:14:25 -0800
commit: 31f64e9b484bbd427ac2b4b9c4c4bd1d2a03b5b2 (patch)
tree: 63b8c46d68088ad0d916c43258565a9c91f3d644
parent: bc9a09a81420b8e2ef2d218bcbd5c518263eff67 (diff)
download: subsurface-31f64e9b484bbd427ac2b4b9c4c4bd1d2a03b5b2.tar.gz
19 files changed, 4539 insertions, 5065 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index 17d2ccbf2..1ffdc4a1c 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>И</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>З</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Запиши като...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Профил</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Предишен ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Следващ ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Избери събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Въведи план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Напечатай само избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Печатай в цвят</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Тип на печата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 гмуркания на стр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 гмуркания на стр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Печат на таблица</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Подредба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Профил от горе</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Бележки от горе</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Редактирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Връщане към OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> край</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Бара</translation>
+        <source>bar</source>
+        <translation>бара</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>време за гмуркане</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>време за гмуркане</translation>
+        <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="142"/>
@@ -2487,7 +2458,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_ca_ES.ts b/translations/subsurface_ca_ES.ts
index 7b057fbff..b45fec24b 100644
--- a/translations/subsurface_ca_ES.ts
+++ b/translations/subsurface_ca_ES.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
+        <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
-        <source>Import File (CSV)</source>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
+        <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
-        <source>...</source>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
-        <source>Time</source>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
-        <source>Depth</source>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
+        <source>Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
-        <source>Temp</source>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
+        <source>Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
+        <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation type="unfinished"/>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"/>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation type="unfinished"/>
     </message>
@@ -2297,12 +2267,13 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
+        <source>divetime</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
+        <source>below floor</source>
+        <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2482,7 +2453,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 4e13b2169..8c587ee18 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Dyk notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Sigtbarhed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Udstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Dyk info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dykker Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Flasker </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Gem som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Forrige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Næste DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Input Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Indstillinger</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Print kun valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Udskriv i farver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 dyk pr side</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 dyk pr side</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Print tabel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Rediger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out to OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>dykketid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>dykketid</translation>
+        <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="142"/>
@@ -2482,7 +2453,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index 6e278c378..653bf8526 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation>Startzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Tauchguide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Ereignisse auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Nur ausgewählte Tauchgänge drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>In Farbe drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Art des Ausdrucks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 Tauchgänge pro Seite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 Tauchgänge pro Seite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tabellendruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Reihenfolge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil oben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notizen oben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>Tauchgangsdauer</translation>
+        <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="142"/>
@@ -2487,7 +2458,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index c0a7d1299..28ef35de8 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation>Datei importieren (CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation>Feld Trenner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation>Feldkonfiguration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation>CSV Datei importieren</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation>PO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation>Stopptiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation>Vorkonfigurierte Importe</translation>
     </message>
@@ -102,7 +102,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation>O2%</translation>
+        <translation>O₂%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation>Deko-AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation>Oberflächendruck</translation>
     </message>
@@ -337,7 +332,7 @@
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
         <source>Handler Position Error</source>
-        <translation type="unfinished"/>
+        <translation>Problematische Position des Knotens</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
@@ -541,259 +536,254 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation>Anfangszeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation>Luft- / Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Tauchgruppenleiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation>Stichworte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Verbrauchtes Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation>Gewichte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation>Reise Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation>Reise Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation>Diese Reise wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation>Mehrere Tauchgänge werden bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation>Dieser Tauchgang wird bearbeitet. Drücke Speichern oder Abbrechen, wenn Du fertig bist.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -801,341 +791,336 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation>Hauptfenster</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation>Strg+Shift+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation>Strg+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation>Dateien importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation>Strg+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportiere &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation>Strg+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation>Strg+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation>Von &amp;Tauchcomputer importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>&amp;GPS Daten vom Subsurface Service importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation>Strg+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation>Gerätenamen &amp;bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation>Strg++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation>Strg+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation>&amp;Zoom ein-/ausschalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation>Strg+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation>Tauchgangliste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Bedienungsanleitung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation>Tauchgang p&amp;lanen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation>Strg+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation>CSV importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation>CS&amp;V importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation>von Divelogs.de importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation>Strg+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation>Strg+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation>automatisch gruppieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation>Strg+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation>Strg+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation>Strg+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation>Strg+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Vorh. TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Nächster TC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Ereignisse auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Plan eingeben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation>Strg+5</translation>
     </message>
@@ -1199,11 +1184,6 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation>Standardeinstellungen</translation>
@@ -1366,7 +1346,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"/>
+        <translation>Zeiteinheit für Geschwindigkeit bei Abstieg/Aufstieg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
@@ -1386,7 +1366,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation>pO2</translation>
+        <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
@@ -1411,11 +1391,6 @@ Bitte entferne diese zuerst.</translation>
         <translation>MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation>max. pp02</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</translation>
@@ -1451,11 +1426,6 @@ Bitte entferne diese zuerst.</translation>
         <translation>Null-/Auftauchzeit berechnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation>AMV anzeigen</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation>GF low bei maximaler Tiefe anwenden</translation>
@@ -1466,6 +1436,21 @@ Bitte entferne diese zuerst.</translation>
         <translation>Sonstiges</translation>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation>max. PPO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>AMV</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation>GF low</translation>
@@ -1535,84 +1520,79 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation>Druckoptionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Nur ausgewählte Tauchgänge drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Farbdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Art des Ausdrucks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 Tauchgänge pro Seite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 Tauchgänge pro Seite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tabellendruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Reihenfolge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil oben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notizen oben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"/>
+        <translation>Höhe (% des Layouts)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation>Höhe des Profils (43% - 85%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"/>
+        <translation>Höhe der anderen Daten (8% - 17%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation>Höhe der Notizen (0% - 52%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation>0</translation>
     </message>
@@ -1676,30 +1656,30 @@ Bitte entferne diese zuerst.</translation>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
@@ -1781,12 +1761,12 @@ Bitte entferne diese zuerst.</translation>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation>Keine Positionsdaten - Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation>Tauchgang wird editiert - Karte verschieben und Tauchplatz mit Doppelklick markieren</translation>
     </message>
@@ -1860,11 +1840,6 @@ Bitte entferne diese zuerst.</translation>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
@@ -1921,11 +1896,6 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
@@ -1940,19 +1910,19 @@ Bitte entferne diese zuerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
-        <translation type="unfinished"/>
+        <source>ml</source>
+        <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -2164,7 +2134,7 @@ Mittel</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
@@ -2173,8 +2143,8 @@ Mittel</translation>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
@@ -2308,13 +2278,14 @@ Mittel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>Tauchgangsdauer</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>Tauchgangsdauer</translation>
+        <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="142"/>
@@ -2329,7 +2300,7 @@ Mittel</translation>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation>PO2</translation>
+        <translation>PO₂</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
@@ -2498,7 +2469,7 @@ Mittel</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
@@ -2611,7 +2582,8 @@ Sicherheitsstopp:%umin @ %.0f %s</translation>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"/>
+        <translation>@:%d:%02d
+Tiefe:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
@@ -2738,18 +2710,19 @@ Auftauchzeit:%umin (berechnet)</translation>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sTiefe:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>%s %sTiefe:%.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
@@ -2765,7 +2738,7 @@ Auftauchzeit:%umin (berechnet)</translation>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
@@ -3172,17 +3145,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
     <message>
         <location filename="../uemis.c" line="201"/>
         <source>PO2 Green Warning</source>
-        <translation>Warnung: PO2 Grün</translation>
+        <translation>Warnung: PO₂ Grün</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="204"/>
         <source>PO2 Ascend Warning</source>
-        <translation>Warnung: Aufstieg / PO2</translation>
+        <translation>Warnung: Aufstieg / PO₂</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="206"/>
         <source>PO2 Ascend Alarm</source>
-        <translation>Alarm: Aufstieg / PO2</translation>
+        <translation>Alarm: Aufstieg / PO₂</translation>
     </message>
     <message>
         <location filename="../uemis.c" line="210"/>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index b81ff0255..232f5e865 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Hora de entrada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -87,27 +87,27 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"/>
+        <translation>Presión de trabajo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"/>
+        <translation>Presión inicial</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"/>
+        <translation>Presión final</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"/>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"/>
+        <translation>HE</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
@@ -140,13 +140,14 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"/>
+        <translation>¿ Borrar el ordenador seleccionado ? </translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"/>
+        <translation>¿ Seguro que deseas eliminar el
+ordenador seleccionado ?</translation>
     </message>
 </context>
 <context>
@@ -159,7 +160,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
         <source>Device ID</source>
-        <translation type="unfinished"/>
+        <translation>ID del dispositivo</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1235"/>
@@ -177,12 +178,12 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"/>
+        <translation>l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"/>
+        <translation>Pie³/min</translation>
     </message>
 </context>
 <context>
@@ -190,17 +191,17 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar ventana de busqueda</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"/>
+        <translation>Expandir todo</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"/>
+        <translation>Encoger todo</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
@@ -260,7 +261,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Guardar archivo como</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
@@ -270,56 +271,51 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"/>
+        <translation>Mezclar las inmersiones seleccionadas</translation>
     </message>
 </context>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>CAS en fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"/>
+        <translation>CAS en parada DECO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
-        <translation type="unfinished"/>
+        <translation>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
-        <translation type="unfinished"/>
+        <translation>Hora de inicio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Presión atmosférica</translation>
     </message>
 </context>
 <context>
@@ -327,12 +323,12 @@
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"/>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"/>
+        <translation>30ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
@@ -343,7 +339,8 @@
         <location filename="../qt-ui/diveplanner.cpp" line="385"/>
         <source>One or more of your stops will be lost with this operations, 
 Please, remove them first.</source>
-        <translation type="unfinished"/>
+        <translation>Una o más de tus paradas se perderán con estas operaciones.
+Por favor, bórralas antes.</translation>
     </message>
 </context>
 <context>
@@ -356,7 +353,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"/>
+        <translation>Profundidad final</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
@@ -366,22 +363,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"/>
+        <translation>Gas usado</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
         <source>CC Set Point</source>
-        <translation type="unfinished"/>
+        <translation>CC Set Point</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1268"/>
         <source>Discard the Plan?</source>
-        <translation type="unfinished"/>
+        <translation>¿ Descartar el plan ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1269"/>
         <source>You are about to discard your plan.</source>
-        <translation type="unfinished"/>
+        <translation>Vas a descartar tu plan.</translation>
     </message>
 </context>
 <context>
@@ -389,7 +386,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="934"/>
         <source>Dive Planner Points</source>
-        <translation type="unfinished"/>
+        <translation>Puntos del planificador de inmersiones</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
@@ -476,7 +473,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
@@ -499,22 +496,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"/>
+        <translation>Proveedor</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"/>
+        <translation>Ordenador de buceo</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"/>
+        <translation>Dispositivo o Punto de montaje</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
@@ -524,275 +521,270 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Preferir siempre las inmersiones descargadas</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Notas de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
-        <translation type="unfinished"/>
+        <translation>Hora de comienzo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"/>
+        <translation>Temperaturas aire/agua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
-        <translation type="unfinished"/>
+        <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Visibilidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Equipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Información de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
-        <translation type="unfinished"/>
+        <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
-        <translation type="unfinished"/>
+        <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"/>
+        <translation>Gas consumido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
-        <translation>SAC</translation>
+        <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Profundidad máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Profundidad media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Presión atmosférica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura del aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Duración de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
-        <translation type="unfinished"/>
+        <translation>Salinidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Tiempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Añadir botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"/>
+        <translation>Añadir sistema de lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
-        <translation type="unfinished"/>
+        <translation>Ubicación del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"/>
+        <translation>Notas del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
-        <translation type="unfinished"/>
+        <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -800,343 +792,338 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"/>
+        <translation>Importar Archivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
-        <translation type="unfinished"/>
+        <translation>Añadir inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
-        <translation type="unfinished"/>
+        <translation>Auto agrupar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
-        <translation>Anterior DC</translation>
+        <translation>Anterior ordenador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
-        <translation type="unfinished"/>
+        <translation>Izquierda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Siguiente DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
-        <translation type="unfinished"/>
+        <translation>Derecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Seleccionar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Introducir Plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
-        <translation type="unfinished"/>
+        <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
@@ -1146,17 +1133,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
+        <translation>No puedo encontrar el manual de Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"/>
+        <translation>¿ Quieres guardar los cambios que has hecho en el archivo %1 ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"/>
+        <translation>¿ Quieres guardar los cambios que has hecho en el archivo de datos ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
@@ -1166,13 +1153,13 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"/>
+        <translation>Los cambios se perderán si no los guardas</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Guardar archivo como</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -1192,17 +1179,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1215,22 +1197,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"/>
+        <translation>Gráfico</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"/>
+        <translation>Listas y tablas</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"/>
+        <translation>Fuente</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"/>
+        <translation>Tamaño de fuente</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
@@ -1240,17 +1222,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"/>
+        <translation>Archivo de inmersiones por defecto</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar no validas</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
@@ -1265,22 +1247,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"/>
+        <translation>Sistema</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"/>
+        <translation>Métrico</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"/>
+        <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"/>
+        <translation>Personalizar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
@@ -1310,12 +1292,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"/>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"/>
+        <translation>Volumen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
@@ -1350,7 +1332,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"/>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
@@ -1360,89 +1342,84 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"/>
+        <translation>Unidades de tiempo</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"/>
+        <translation>Denominador de la velocidad de ascenso/descenso</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"/>
+        <translation>Minutos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"/>
+        <translation>Segundos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"/>
+        <translation>pO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"/>
+        <translation>umbral</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"/>
+        <translation>pN2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"/>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
+        <translation>PMO</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"/>
+        <translation>PEA PNE EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Techo informado por el ordenador</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"/>
+        <translation>Dibujar el techo en rojo</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Techo calculado</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar todos los tejidos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"/>
+        <translation>Incrementos de 3m</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
@@ -1450,11 +1427,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1462,27 +1434,42 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
+        <translation>Varios</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Preferencias</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GF bajo</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GF alto</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"/>
+        <translation>Abrir archivo de registro por defecto</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -1490,7 +1477,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Imprimir</translation>
     </message>
 </context>
 <context>
@@ -1534,86 +1521,81 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
-        <translation type="unfinished"/>
+        <translation>Opciones de impresión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Imprimir sólo inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Impresión en color</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Tipo de impresión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 inmersiones por página</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 inmersiones por página</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Impresión de tabla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Ordenar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Perfil arriba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notas arriba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"/>
+        <translation>Ajustar alturas (% de la distribución)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"/>
+        <translation>Altura del perfil (43% - 85%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"/>
+        <translation>Altura de datos (8% - 17%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"/>
+        <translation>Altura de las notas (0% - 52%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
-        <translation type="unfinished"/>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -1642,7 +1624,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"/>
+        <translation>Ordenador desconocido</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
@@ -1652,12 +1634,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"/>
+        <translation>Escala</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"/>
+        <translation>Regla</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
@@ -1675,30 +1657,30 @@ Please, remove them first.</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
-        <translation type="unfinished"/>
+        <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Cambio de emergencia a OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>comienzo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fin</translation>
@@ -1714,17 +1696,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"/>
+        <translation>Inmersión #%1 - %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"/>
+        <translation>Profundidad máxima: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"/>
+        <translation>Duración: %1 min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
@@ -1759,7 +1741,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Lastre</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
@@ -1780,12 +1762,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1841,6 @@ Please, remove them first.</source>
         <translation>Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,14 +1897,9 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Añadir botella</translation>
     </message>
 </context>
 <context>
@@ -1939,19 +1911,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2125,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
@@ -2162,8 +2134,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>aire</translation>
     </message>
@@ -2297,13 +2269,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>duración de inmersión</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>duración de inmersión</translation>
+        <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="142"/>
@@ -2487,7 +2460,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index a2fce9051..76a3637e0 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Sukeldumise märkused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Reiting</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Nähtavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Varustus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Sukeldumise info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Sukeldumise aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Koguaeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Balloonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Uus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Salvesta kui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profiil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Eelmine kompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Uus kompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Vali sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Sisesta plaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Subsurface kohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Eelistused</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Väljasta ainult valitud sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Väljasta värvilisena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Väljastuse tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 sukeldumist lehel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 sukeldumist lehel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tabeli trükk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Tellimas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profiil ülal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Märkmed ülal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Toimeta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Üleminek avatud süsteemile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> algus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> lõpp</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>Subsurface kohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) või (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>sukeldumisaeg</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>sukeldumisaeg</translation>
+        <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="142"/>
@@ -2487,7 +2458,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index cd9dbaa67..390d21b2d 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -2,74 +2,74 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
-        <translation type="unfinished"/>
+        <translation>Liitä tiedot CSV-tiedostosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
-        <translation type="unfinished"/>
+        <translation>Kentän erotin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Kentän määritys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation>Liitä CSV -tiedosto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
-        <translation type="unfinished"/>
+        <translation>Cns</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
-        <translation type="unfinished"/>
+        <translation>Pysähdyssyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
+        <translation>Esiasetetut tuonnit</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>Open CSV Log File</source>
-        <translation type="unfinished"/>
+        <translation>Avaa CSV-tiedosto</translation>
     </message>
     <message>
         <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
         <source>CSV Files (*.csv)</source>
-        <translation type="unfinished"/>
+        <translation>CSV Tiedostot (*.csv)</translation>
     </message>
 </context>
 <context>
@@ -87,7 +87,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"/>
+        <translation>Paineluokka</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
@@ -112,22 +112,22 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>Switch at</source>
-        <translation type="unfinished"/>
+        <translation>Vaihda syvyydessä</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="163"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation type="unfinished"/>
+        <translation>Poista säiliö.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="385"/>
         <source>Cylinder cannot be removed</source>
-        <translation type="unfinished"/>
+        <translation>Säiliötä ei voida poistaa</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="386"/>
         <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation type="unfinished"/>
+        <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation>
     </message>
 </context>
 <context>
@@ -170,7 +170,7 @@ poistaa valitun sukellustietokoneen?</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"/>
+        <translation>Poista sukellustietokone.</translation>
     </message>
 </context>
 <context>
@@ -191,82 +191,82 @@ poistaa valitun sukellustietokoneen?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"/>
+        <translation>Näytä hakukenttä</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"/>
+        <translation>laajenna kaikki</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"/>
+        <translation>supista kaikki</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
         <source>collapse others</source>
-        <translation type="unfinished"/>
+        <translation>tiivistä muut</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="638"/>
         <source>remove dive(s) from trip</source>
-        <translation type="unfinished"/>
+        <translation>erota sukellukset retkestä</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="639"/>
         <source>create new trip above</source>
-        <translation type="unfinished"/>
+        <translation>luo uusi retki yläpuolelle</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="640"/>
         <source>add dive(s) to trip immideately above</source>
-        <translation type="unfinished"/>
+        <translation>lisää sukellukset yläpuoliseen retkeen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="643"/>
         <source>merge trip with trip above</source>
-        <translation type="unfinished"/>
+        <translation>liitä retki yllä olevaan retkeen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="644"/>
         <source>merge trip with trip below</source>
-        <translation type="unfinished"/>
+        <translation>liitä retki alla olevaan retkeen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="648"/>
         <source>delete dive(s)</source>
-        <translation type="unfinished"/>
+        <translation>poista sukellukset</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="652"/>
         <source>save As</source>
-        <translation type="unfinished"/>
+        <translation>tallenna nimellä</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="653"/>
         <source>export As UDDF</source>
-        <translation type="unfinished"/>
+        <translation>vie UDDF</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="654"/>
         <source>shift times</source>
-        <translation type="unfinished"/>
+        <translation>muuta aikoja</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>Save Dives As...</source>
-        <translation type="unfinished"/>
+        <translation>Tallenna sukellukset nimellä...</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Tallenna nimellä</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
+        <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
@@ -277,50 +277,45 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
-        <translation type="unfinished"/>
+        <translation>Ilmankulutus pohjalla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
-        <translation type="unfinished"/>
+        <translation>Ilmankulutus deco-pysähdyksessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
-        <translation type="unfinished"/>
+        <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation>Alkuaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Ilmanpaine</translation>
     </message>
 </context>
 <context>
@@ -396,12 +391,12 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="937"/>
         <source>Available Gases</source>
-        <translation type="unfinished"/>
+        <translation>Mahdolliset kaasut</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="954"/>
         <source>add dive data point</source>
-        <translation type="unfinished"/>
+        <translation>lisää sukellusetappi</translation>
     </message>
 </context>
 <context>
@@ -478,7 +473,7 @@ poista ensin pysähdykset.</translation>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
@@ -526,275 +521,270 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Suosi aina ladattuja sukelluksia</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Peruuta</translation>
     </message>
 </context>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
-        <translation type="unfinished"/>
+        <translation>Alkuaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"/>
+        <translation>ilman / veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
-        <translation type="unfinished"/>
+        <translation>Koordinaatit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Varusteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
-        <translation type="unfinished"/>
+        <translation>Aikaväli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
-        <translation type="unfinished"/>
+        <translation>Käytetyt kaasut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"/>
+        <translation>Kaasun kulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Maksimisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Ilmanpaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Sukellusaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
-        <translation type="unfinished"/>
+        <translation>Suolapitoisuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Kokonaisaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Sukelluskerrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"/>
+        <translation>Lisää painojärjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
-        <translation type="unfinished"/>
+        <translation>Matkakohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"/>
+        <translation>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"/>
+        <translation>Tätä sukellusta muokataan. Lopeta valitsemalla Tallenna tai Peruuta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"/>
+        <translation>Muokataan useita sukelluksia. Lopeta valitsemalla Tallenna tai Peruuta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
-        <translation type="unfinished"/>
+        <translation>Sukellusta muokataan. Lopeta valitsemalla Tallenna tai Peruuta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
-        <translation type="unfinished"/>
+        <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -802,343 +792,338 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
-        <translation type="unfinished"/>
+        <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
-        <translation type="unfinished"/>
+        <translation>Loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation>Näkymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
-        <translation type="unfinished"/>
+        <translation>Apua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
-        <translation type="unfinished"/>
+        <translation>Liitä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
-        <translation type="unfinished"/>
+        <translation>Uusi loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
-        <translation type="unfinished"/>
+        <translation>Avaa loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Avaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"/>
+        <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
-        <translation type="unfinished"/>
+        <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Tallenna nimellä...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"/>
+        <translation>Liitä tiedostot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
-        <translation type="unfinished"/>
+        <translation>Vie UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"/>
+        <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished"/>
+        <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
-        <translation type="unfinished"/>
+        <translation>Hae sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
-        <translation type="unfinished"/>
+        <translation>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
-        <translation type="unfinished"/>
+        <translation>Muokkaa laitenimeä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
-        <translation type="unfinished"/>
+        <translation>Uudellennumeroi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
-        <translation type="unfinished"/>
+        <translation>Venytä sukellusprofiilikuvaajaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
-        <translation type="unfinished"/>
+        <translation>Sukelluslista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profiilikuvaaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
-        <translation type="unfinished"/>
+        <translation>Kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
-        <translation type="unfinished"/>
+        <translation>Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
-        <translation type="unfinished"/>
+        <translation>Maapallo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
-        <translation type="unfinished"/>
+        <translation>Sukelluksen suunnittelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
-        <translation type="unfinished"/>
+        <translation>Liitä CSV-tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
-        <translation type="unfinished"/>
+        <translation>Liitä CSV-tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
-        <translation type="unfinished"/>
+        <translation>Tuo Divelogs.de -sivustolta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
-        <translation type="unfinished"/>
+        <translation>Lisää sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
-        <translation type="unfinished"/>
+        <translation>Ryhmittele automaattisesti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Edellinen tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
-        <translation type="unfinished"/>
+        <translation>Vasen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Seuraava tietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
-        <translation type="unfinished"/>
+        <translation>Oikea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Valitse tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Suunnittele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
-        <translation type="unfinished"/>
+        <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
@@ -1148,17 +1133,17 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
+        <translation>Subsurfacen käyttöohje ei löydy</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
         <source>Do you want to save the changes you made in the file %1?</source>
-        <translation type="unfinished"/>
+        <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="529"/>
         <source>Do you want to save the changes you made in the datafile?</source>
-        <translation type="unfinished"/>
+        <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
@@ -1168,13 +1153,13 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"/>
+        <translation>Muutokset hylätään, jos et tallenna niitä.</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Tallenna nimellä</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -1184,30 +1169,25 @@ poista ensin pysähdykset.</translation>
         <location filename="../qt-ui/mainwindow.cpp" line="286"/>
         <location filename="../qt-ui/mainwindow.cpp" line="842"/>
         <source>Warning</source>
-        <translation type="unfinished"/>
+        <translation>Varoitus</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="197"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
+        <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
-        <translation type="unfinished"/>
+        <translation>Oletukset</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="90"/>
@@ -1217,22 +1197,22 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="100"/>
         <source>Graph</source>
-        <translation type="unfinished"/>
+        <translation>Kuvaaja</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="126"/>
         <source>Lists and Tables</source>
-        <translation type="unfinished"/>
+        <translation>Listat ja taulukot</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"/>
+        <translation>Fontti</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
         <source>Font size</source>
-        <translation type="unfinished"/>
+        <translation>Fontin koko</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
@@ -1242,47 +1222,47 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
         <source>Default Dive file</source>
-        <translation type="unfinished"/>
+        <translation>Oletus lokitiedosto</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
         <source>Display Invalid</source>
-        <translation type="unfinished"/>
+        <translation>Näytä epäkelvot</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="199"/>
         <source>Default Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Oletussäiliö</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="205"/>
         <source>Use Default Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Käytä oletussäiliötä</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"/>
+        <translation>Järjestelmä</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"/>
+        <translation>Metrinen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"/>
+        <translation>Brittiläinen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
         <source>Personalize</source>
-        <translation type="unfinished"/>
+        <translation>Mukauta</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="292"/>
@@ -1312,12 +1292,12 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"/>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"/>
+        <translation>Tilavuus</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
@@ -1352,7 +1332,7 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"/>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
@@ -1362,129 +1342,134 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>Time units</source>
-        <translation type="unfinished"/>
+        <translation>Aikayksiköt</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="438"/>
         <source>Ascent/Descent speed denominator</source>
-        <translation type="unfinished"/>
+        <translation>Nousu/laskunopeuden yksikkö</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"/>
+        <translation>Minuuttia</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"/>
+        <translation>Sekuntia</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
         <source>Show</source>
-        <translation type="unfinished"/>
+        <translation>Näytä</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="495"/>
         <source>pO2</source>
-        <translation type="unfinished"/>
+        <translation>pO2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="518"/>
         <location filename="../qt-ui/preferences.ui" line="559"/>
         <location filename="../qt-ui/preferences.ui" line="600"/>
         <source>threshold</source>
-        <translation type="unfinished"/>
+        <translation>kynnys</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="536"/>
         <source>pN2</source>
-        <translation type="unfinished"/>
+        <translation>pN2</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="577"/>
         <source>pHe</source>
-        <translation type="unfinished"/>
+        <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="618"/>
         <source>MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
+        <translation>MOD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
-        <translation type="unfinished"/>
+        <translation>EAD END EADD</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="666"/>
         <source>Dive computer reported ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Sukellustietokoneen raportoima kattosyvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="689"/>
         <source>draw ceiling red</source>
-        <translation type="unfinished"/>
+        <translation>piirrä kattosyvyys punaisella</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="700"/>
         <source>Calculated ceiling</source>
-        <translation type="unfinished"/>
+        <translation>Laskettu kattosyvyys</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="723"/>
         <source>show all tissues</source>
-        <translation type="unfinished"/>
+        <translation>näytä kaikki kudokset</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="733"/>
         <source>3m increments</source>
-        <translation type="unfinished"/>
+        <translation>3m portaat</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="743"/>
         <source>Calculate NDL/TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
+        <translation>Laske NDL/TTS</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
-        <translation type="unfinished"/>
+        <translation>GFLow maksimisyvyydessä</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="766"/>
         <source>Misc</source>
-        <translation type="unfinished"/>
+        <translation>Sekalaiset</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Asetukset</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation>max PPO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
-        <translation type="unfinished"/>
+        <translation>GFlow</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="782"/>
         <source>GFHigh</source>
-        <translation type="unfinished"/>
+        <translation>GFhigh</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Open Default Log File</source>
-        <translation type="unfinished"/>
+        <translation>Avaa oletustiedosto</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -1492,7 +1477,7 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/printdialog.cpp" line="32"/>
         <source>&amp;Print</source>
-        <translation type="unfinished"/>
+        <translation>Tulosta</translation>
     </message>
 </context>
 <context>
@@ -1536,86 +1521,81 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
-        <translation type="unfinished"/>
+        <translation>Tulostusasetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Tulosta valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Väritulostus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Tulosteen tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>Kuusi sukellusta sivulle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>Kaksi sukellusta sivulle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Taulukkotuloste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Järjestys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profiili yllä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Muistiinpanot yllä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
-        <translation type="unfinished"/>
+        <translation>Korkeuksien määritys (% tilasta)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
-        <translation type="unfinished"/>
+        <translation>Profiilin korkeus (43% - 85%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
-        <translation type="unfinished"/>
+        <translation>Muun tiedon korkeus (8% - 17%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
-        <translation type="unfinished"/>
+        <translation>Muistiinpanojen korkeus (0% - 52%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
-        <translation type="unfinished"/>
+        <translation>0</translation>
     </message>
 </context>
 <context>
@@ -1623,53 +1603,53 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"/>
+        <translation>Piilota tapahtumat</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
         <source>Hide all %1 events?</source>
-        <translation type="unfinished"/>
+        <translation>Piilota kaikki %1 tapahtumat</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="222"/>
         <source>Remove the selected event?</source>
-        <translation type="unfinished"/>
+        <translation>Poistetaanko valitut tapahtumat?</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="223"/>
         <source>%1 @ %2:%3</source>
-        <translation type="unfinished"/>
+        <translation>%1 @ %2:%3</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"/>
+        <translation>tuntematon sukellustietokone</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
         <source>Set Duration: 10 minutes</source>
-        <translation type="unfinished"/>
+        <translation>Aseta kesto: 10 minuuttia</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"/>
+        <translation>Mittakaava</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
         <source>Ruler</source>
-        <translation type="unfinished"/>
+        <translation>Viivain</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="516"/>
         <source>Measure properties of dive segments</source>
-        <translation type="unfinished"/>
+        <translation>Mittaa sukellusetappien ominaisuuksia</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="517"/>
         <source>Scale your dive to screen size</source>
-        <translation type="unfinished"/>
+        <translation>Laajenna profiili tilan mukaan</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="530"/>
@@ -1677,30 +1657,30 @@ poista ensin pysähdykset.</translation>
         <translation>Muuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
-        <translation type="unfinished"/>
+        <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Vaihto avoimeen ilman kiertoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>alku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>loppu</translation>
@@ -1716,17 +1696,17 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
         <source>Dive #%1 - %2</source>
-        <translation type="unfinished"/>
+        <translation>Sukellus #%1 - %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1623"/>
         <source>Max depth: %1 %2</source>
-        <translation type="unfinished"/>
+        <translation>Suurin syvyys: %1 %2</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1630"/>
         <source>Duration: %1 min</source>
-        <translation type="unfinished"/>
+        <translation>Kesto: %1 min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1635"/>
@@ -1761,12 +1741,12 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Painot</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
         <source>Total weight</source>
-        <translation type="unfinished"/>
+        <translation>Kokonaismassa</translation>
     </message>
 </context>
 <context>
@@ -1779,17 +1759,17 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="723"/>
         <source>Remove this Point</source>
-        <translation type="unfinished"/>
+        <translation>Poista tämä etappi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <translation>Ei sijaintitietoa - kaksoisnäpäytä sijaintia asettaaksesi sukelluskohteen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <translation>Sukelluksen muokkaus - kaksoisnäpäytä sijaintia asettaaksesi sukelluskohteen</translation>
     </message>
     <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
@@ -1830,27 +1810,27 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="14"/>
         <source>Shift selected times</source>
-        <translation type="unfinished"/>
+        <translation>Muuta valittujen aikaa</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="35"/>
         <source>Shift times of selected dives by</source>
-        <translation type="unfinished"/>
+        <translation>Muuta valittujen sukellusten aikaa</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="80"/>
         <source>h:mm</source>
-        <translation type="unfinished"/>
+        <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="90"/>
         <source>earlier</source>
-        <translation type="unfinished"/>
+        <translation>aiemmin</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="97"/>
         <source>later</source>
-        <translation type="unfinished"/>
+        <translation>myöhemmin</translation>
     </message>
 </context>
 <context>
@@ -1861,24 +1841,19 @@ poista ensin pysähdykset.</translation>
         <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
-        <translation type="unfinished"/>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="22"/>
         <source>&amp;License</source>
-        <translation type="unfinished"/>
+        <translation>Lisenssi</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
         <source>&amp;Website</source>
-        <translation type="unfinished"/>
+        <translation>Websivu</translation>
     </message>
 </context>
 <context>
@@ -1891,12 +1866,12 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="115"/>
         <source>Wait a bit untill we have something...</source>
-        <translation type="unfinished"/>
+        <translation>Odota...</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="131"/>
         <source>Download Finished</source>
-        <translation type="unfinished"/>
+        <translation>Lataus valmistui</translation>
     </message>
     <message>
         <location filename="../qt-ui/subsurfacewebservices.cpp" line="155"/>
@@ -1922,14 +1897,9 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Lisää säiliö</translation>
     </message>
 </context>
 <context>
@@ -1937,25 +1907,25 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Kuvaus</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
-        <translation type="unfinished"/>
+        <source>ml</source>
+        <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
-        <translation type="unfinished"/>
+        <translation>Tiedot</translation>
     </message>
 </context>
 <context>
@@ -1963,7 +1933,7 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Kuvaus</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
@@ -1976,27 +1946,27 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
         <source>Download Location Data</source>
-        <translation type="unfinished"/>
+        <translation>Lataa sijaintitieto</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="20"/>
         <source>Status:</source>
-        <translation type="unfinished"/>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="27"/>
         <source>Enter your ID here</source>
-        <translation type="unfinished"/>
+        <translation>Syötä käyttäjätunnus</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="34"/>
         <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Lataa</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="58"/>
         <source>User ID</source>
-        <translation type="unfinished"/>
+        <translation>Käyttäjätunnus</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="72"/>
@@ -2006,7 +1976,7 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/webservices.ui" line="86"/>
         <source>Upload</source>
-        <translation type="unfinished"/>
+        <translation>Lähetä</translation>
     </message>
 </context>
 <context>
@@ -2024,7 +1994,7 @@ poista ensin pysähdykset.</translation>
     <message>
         <location filename="../qt-ui/models.cpp" line="460"/>
         <source>Clicking here will remove this weigthsystem.</source>
-        <translation type="unfinished"/>
+        <translation>Poista painojärjestelmä näpäyttämällä ikonia.</translation>
     </message>
 </context>
 <context>
@@ -2033,7 +2003,8 @@ poista ensin pysähdykset.</translation>
         <location filename="../qt-ui/models.cpp" line="1411"/>
         <source>Year 
  &gt; Month / Trip</source>
-        <translation type="unfinished"/>
+        <translation>Vuosi
+&gt; Kuukausi / Retki</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1412"/>
@@ -2044,31 +2015,36 @@ poista ensin pysähdykset.</translation>
         <location filename="../qt-ui/models.cpp" line="1413"/>
         <source>Duration 
  Total</source>
-        <translation type="unfinished"/>
+        <translation>Kesto
+Kokonais</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1414"/>
         <source>
 Average</source>
-        <translation type="unfinished"/>
+        <translation>
+Keskim.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1415"/>
         <source>
 Shortest</source>
-        <translation type="unfinished"/>
+        <translation>
+Lyhin</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1416"/>
         <source>
 Longest</source>
-        <translation type="unfinished"/>
+        <translation>
+Pisin</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1417"/>
         <source>Depth (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>Dyvyys (%1)
+Keski</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1418"/>
@@ -2076,7 +2052,8 @@ Longest</source>
         <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Minimum</source>
-        <translation type="unfinished"/>
+        <translation>
+Alin</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1419"/>
@@ -2084,19 +2061,22 @@ Minimum</source>
         <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Maximum</source>
-        <translation type="unfinished"/>
+        <translation>
+Suurin</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1420"/>
         <source>SAC (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>SAC (%1)
+Keski</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Temp. (%1)
  Average</source>
-        <translation type="unfinished"/>
+        <translation>Lämpö (%1)
+Keski</translation>
     </message>
 </context>
 <context>
@@ -2155,7 +2135,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) tai (%s)</translation>
     </message>
@@ -2164,8 +2144,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>ilma</translation>
     </message>
@@ -2208,13 +2188,13 @@ Maximum</source>
         <location filename="../file.c" line="265"/>
         <location filename="../file.c" line="267"/>
         <source>Failed to read &apos;%s&apos;. Use import for CSV files.</source>
-        <translation type="unfinished"/>
+        <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui. Käytä Liitä -toimintoa CSV -tiedostoille</translation>
     </message>
     <message>
         <location filename="../file.c" line="347"/>
         <location filename="../file.c" line="349"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"/>
+        <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="138"/>
@@ -2299,13 +2279,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>sukellusaika</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>sukellusaika</translation>
+        <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="142"/>
@@ -2395,7 +2376,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="472"/>
         <source>Error obtaining surface pressure</source>
-        <translation type="unfinished"/>
+        <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="481"/>
@@ -2489,7 +2470,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
@@ -2574,7 +2555,8 @@ T: %.1f %s</translation>
         <location filename="../profile.c" line="1215"/>
         <source>%s
 V:%.2f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s
+N:%.2f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1301"/>
@@ -2587,7 +2569,8 @@ Laskettu katto %.0f %s</translation>
         <location filename="../profile.c" line="1308"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Kudos %.0fmin: %.0f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1255"/>
@@ -2600,13 +2583,15 @@ Turvapysähdys: %u min @ %.0f %s</translation>
         <location filename="../profile.c" line="1199"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
-        <translation type="unfinished"/>
+        <translation>@:%d:%02d
+S:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1219"/>
         <source>%s
 SAC:%2.1fl/min</source>
-        <translation type="unfinished"/>
+        <translation>%s
+SAC:%2.1fl/min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1258"/>
@@ -2693,94 +2678,100 @@ EADD: %d %s</translation>
         <location filename="../profile.c" line="1280"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Deco:%umin @ %.0f %s (lask.)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1289"/>
         <source>%s
 In deco (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+Dekossa (lask.)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1292"/>
         <source>%s
 NDL:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+NDL:%umin (lask.)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1296"/>
         <source>%s
 TTS:%umin (calc)</source>
-        <translation type="unfinished"/>
+        <translation>%s
+TTS:%umin (lask.)</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1405"/>
         <source>%sT: %d:%02d min</source>
-        <translation type="unfinished"/>
+        <translation>%sA: %d:%02d min</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1409"/>
         <location filename="../profile.c" line="1413"/>
         <source>%s %sD:%.1f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sS:%.1f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1417"/>
         <source>%s %sD:%.1f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sS:%.1f %s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1421"/>
         <source>%s %sD:%.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>%s %sS:%.1f%s
+</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s%sN:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sN:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
         <source>%s %sP:%d %s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sP:%d %s</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="283"/>
         <source>C</source>
-        <translation type="unfinished"/>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="287"/>
         <source>F</source>
-        <translation type="unfinished"/>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
+        <translation>%1, %3.%2.%4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
         <source>%1 %2, %3
 %4:%5</source>
-        <translation type="unfinished"/>
+        <translation>%2.%1.%3
+%4:%5</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (1 dive)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
@@ -2850,12 +2841,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"/>
+        <translation>makea</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"/>
+        <translation>oppilas</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
@@ -2870,7 +2861,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"/>
+        <translation>kouluttaja</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 95741daa7..5a285626f 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation>Importer un fichier CSV</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -87,27 +87,27 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>WorkPress</source>
-        <translation type="unfinished"/>
+        <translation>PressService</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>StartPress</source>
-        <translation type="unfinished"/>
+        <translation>PressDébut</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>EndPress</source>
-        <translation type="unfinished"/>
+        <translation>PressFin</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>O2%</source>
-        <translation type="unfinished"/>
+        <translation>O2%</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
         <source>HE</source>
-        <translation type="unfinished"/>
+        <translation>He</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="65"/>
@@ -140,13 +140,14 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"/>
+        <translation>Retirer l&apos;ordinateur de plongée sélectionné ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous sûr de vouloir retirer
+l&apos;ordinateur de plongée sélectionné ?</translation>
     </message>
 </context>
 <context>
@@ -169,7 +170,7 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Clicking here will remove this divecomputer.</source>
-        <translation type="unfinished"/>
+        <translation>Cliquer ici retirera cet ordinateur de plongée.</translation>
     </message>
 </context>
 <context>
@@ -177,12 +178,12 @@
     <message>
         <location filename="../qt-ui/models.cpp" line="1096"/>
         <source> l/min</source>
-        <translation type="unfinished"/>
+        <translation>l/min</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1098"/>
         <source> cuft/min</source>
-        <translation type="unfinished"/>
+        <translation> cuft/min</translation>
     </message>
 </context>
 <context>
@@ -190,17 +191,17 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="41"/>
         <source>Show Search Box</source>
-        <translation type="unfinished"/>
+        <translation>Montrer la barre de recherche</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"/>
+        <translation>tout déplier</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
         <source>collapse all</source>
-        <translation type="unfinished"/>
+        <translation>tout replier</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="636"/>
@@ -260,7 +261,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
@@ -270,54 +271,49 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"/>
+        <translation>fusionner les plongées sélectionnées</translation>
     </message>
 </context>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
-        <translation type="unfinished"/>
+        <translation>Heure de début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -327,12 +323,12 @@
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="134"/>
         <source>10m</source>
-        <translation type="unfinished"/>
+        <translation>10m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="136"/>
         <source>30ft</source>
-        <translation type="unfinished"/>
+        <translation>30ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="384"/>
@@ -356,7 +352,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1070"/>
         <source>Final Depth</source>
-        <translation type="unfinished"/>
+        <translation>Profondeur Finale</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
@@ -366,7 +362,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
         <source>Used Gas</source>
-        <translation type="unfinished"/>
+        <translation>Gaz Utilisé</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1073"/>
@@ -476,7 +472,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="126"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="140"/>
@@ -499,22 +495,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="20"/>
         <source>Vendor</source>
-        <translation type="unfinished"/>
+        <translation>Fabricant</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="27"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"/>
+        <translation>ordinateur de plongée</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="40"/>
         <source>Device or Mount Point</source>
-        <translation type="unfinished"/>
+        <translation>Périphérique ou point de montage</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="54"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="61"/>
@@ -524,275 +520,270 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="68"/>
         <source>Always prefer downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Choisir les plongées téléchargées par défaut</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="90"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="97"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Annuler</translation>
     </message>
 </context>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Notes de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
-        <translation type="unfinished"/>
+        <translation>Heure de début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
-        <translation type="unfinished"/>
+        <translation>Températures air / eau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
-        <translation type="unfinished"/>
+        <translation>Coordonnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Chef de palanquée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Binôme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Visibilité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Équipement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Détails de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
-        <translation type="unfinished"/>
+        <translation>Intervalle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
-        <translation type="unfinished"/>
+        <translation>Gaz utilisés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
-        <translation type="unfinished"/>
+        <translation>Gaz consommé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Profondeur max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
-        <translation type="unfinished"/>
+        <translation>Profondeur moy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Pression d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Température air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Température eau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
-        <translation type="unfinished"/>
+        <translation>Salinité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Temps total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Blocs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un système de poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
-        <translation type="unfinished"/>
+        <translation>Lieu du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
-        <translation type="unfinished"/>
+        <translation>Notes du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
-        <translation type="unfinished"/>
+        <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -800,343 +791,338 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Maj+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"/>
+        <translation>Importer des fichiers</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Informations</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter une plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Ordinateur précédent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
-        <translation type="unfinished"/>
+        <translation>Gauche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Ordinateur suivant</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
-        <translation type="unfinished"/>
+        <translation>Droite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Sélection des événements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Saisir le plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>À propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
-        <translation type="unfinished"/>
+        <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+5</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="110"/>
@@ -1146,7 +1132,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="495"/>
         <source>Cannot find the Subsurface manual</source>
-        <translation type="unfinished"/>
+        <translation>Impossible de trouver le manuel de Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="527"/>
@@ -1172,7 +1158,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -1192,17 +1178,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="725"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1245,7 +1226,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="173"/>
         <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="182"/>
@@ -1315,7 +1296,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
         <source>Volume</source>
-        <translation type="unfinished"/>
+        <translation>Volume</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
@@ -1350,7 +1331,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"/>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
@@ -1370,12 +1351,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"/>
+        <translation>Minutes</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"/>
+        <translation>Secondes</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
@@ -1410,11 +1391,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1426,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1436,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Préférences</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation>PPO2 max</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>Consommation d&apos;air</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1482,7 +1468,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.cpp" line="186"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation type="unfinished"/>
+        <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -1534,84 +1520,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Imprimer uniquement les plongées selectionnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Imprimer en couleur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Type d&apos;impression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 plongées par page</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 plongées par page</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Impression du tableau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Classer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil en haut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notes en haut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1642,7 +1623,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"/>
+        <translation>ordinateur inconnu</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
@@ -1675,30 +1656,30 @@ Please, remove them first.</source>
         <translation>Editer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Passer en CO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> fin</translation>
@@ -1759,7 +1740,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1682"/>
         <source>Weights</source>
-        <translation type="unfinished"/>
+        <translation>Poids</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1688"/>
@@ -1780,12 +1761,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1840,6 @@ Please, remove them first.</source>
         <translation>À propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,14 +1896,9 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un bloc</translation>
     </message>
 </context>
 <context>
@@ -1939,19 +1910,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
-        <translation type="unfinished"/>
+        <source>ml</source>
+        <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2124,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
@@ -2162,8 +2133,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -2297,13 +2268,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>Temps de plongée</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>Temps de plongée</translation>
+        <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="142"/>
@@ -2487,7 +2459,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>Nitrox%d</translation>
     </message>
@@ -2736,13 +2708,13 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../profile.c" line="1425"/>
         <source>%s%sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1429"/>
         <location filename="../profile.c" line="1433"/>
         <source>%s %sV:%.2f%s</source>
-        <translation type="unfinished"/>
+        <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
         <location filename="../profile.c" line="1440"/>
@@ -2762,7 +2734,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../qt-gui.cpp" line="460"/>
         <source>%1, %2 %3, %4 %5:%6</source>
-        <translation type="unfinished"/>
+        <translation>%1, %2 %3, %4 %5:%6</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="473"/>
@@ -2773,12 +2745,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../qt-gui.cpp" line="486"/>
         <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (%3 plongées)</translation>
     </message>
     <message>
         <location filename="../qt-gui.cpp" line="491"/>
         <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
+        <translation>%1 %2 (1 plongée)</translation>
     </message>
     <message>
         <location filename="../dive.c" line="13"/>
@@ -2848,12 +2820,12 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>fresh</source>
-        <translation type="unfinished"/>
+        <translation>eau douce</translation>
     </message>
     <message>
         <location filename="../dive.c" line="17"/>
         <source>student</source>
-        <translation type="unfinished"/>
+        <translation>étudiant</translation>
     </message>
     <message>
         <location filename="../dive.c" line="18"/>
@@ -2868,7 +2840,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"/>
+        <translation>instructeur</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
@@ -3020,7 +2992,7 @@ TTS:%umin (calc)</source>
         <source>Uemis Zurich: File System is almost full
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation>Uemis Zurich : le disque dur est presque plein
+        <translation>Uemis Zurich : le système de fichier est presque plein
 Débranchez puis rebranchez l&apos;ordinateur
 afin d&apos;essayer à nouveau</translation>
     </message>
@@ -3029,7 +3001,7 @@ afin d&apos;essayer à nouveau</translation>
         <source>Uemis Zurich: File System is full
 Disconnect/reconnect the dive computer
 and try again</source>
-        <translation>Uemis Zurich : Le disque dur est plein
+        <translation>Uemis Zurich : Le système de fichier est plein
 Débranchez puis rebranchez l&apos;ordinateur
 afin d&apos;essayer à nouveau</translation>
     </message>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 5c672106f..5e44a865f 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Vrijeme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Voditelj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Oprema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informacije o uronu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistike</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Ukupno trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Boce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Novi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Spremi kao</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Informacije</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Prethodno računalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Sljedeće računalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Odaberi događaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Unesi plan urona</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>O programu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Postavke</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Ispiši odabrane urone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Ispis u boji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Vrsta ispisa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 urona po stranici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 urona po stranici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tablični ispis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Redosljed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil na vrhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Bilješke na vrhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Uredi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Neplanirani prelazak na OC sustav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> započni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> završi</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>O programu Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ili (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>zrak</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>trajanje urona</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>trajanje urona</translation>
+        <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="142"/>
@@ -2487,7 +2458,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index c6e6891c2..0c68b46ab 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Ora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Note dell&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Attrezzatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informazioni sull&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Tempo d&apos;Immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Tempo Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Bombole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Informazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>DC precedente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>DC successivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Seleziona eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Piano in ingresso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Informazioni su Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Preferenze</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Stampa solo le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Stampa a colori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Stampa tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 immersioni per pagina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 immersioni per pagina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Stampa Tabella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Ordinamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profilo in primo piano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Note in primo piano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Modifica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out in corcuito aperto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>inizio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fine</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>Informazioni su Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>durata immersione</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>durata immersione</translation>
+        <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="142"/>
@@ -2488,7 +2459,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index cae455806..277f06ce2 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogboks</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation>Importer fil (CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation>Feltseparator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation>Feltkonfigurasjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation>Stoppdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation>Prekonfigurerte importer</translation>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation>Skjema</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation>SAC på bunn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation>SAC under deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation>GF høy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation>GF lav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation>Siste stopp på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation>Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation>Trykk ATA</translation>
     </message>
@@ -541,259 +536,254 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation>TabWidget</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation>Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation>Temperatur i vann / luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Dykkeleder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Utstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informasjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gasskonsum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Lufttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Vanntemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Saltholdighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Flasker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation>Legg til flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation>Vekter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation>Legg til vektsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation>Tursted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation>Turnotater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation>Denne turen redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation>Flere dykk redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation>Dykket redigeres. Velg Lagre eller Avbryt når du er ferdig.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -801,341 +791,336 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation>Hovedvindu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Åpne loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation>Åpne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation>&amp;Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation>Importer filer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation>Eksporter &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation>&amp;Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avslutt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importer fra &amp;dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importer &amp;GPS-data fra Subsurface-tjenesten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation>%Rediger enhetsnavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation>%Nummerer på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation>Bytt %Zoom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Årlig statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation>Liste over dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation>Bruker&amp;manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation>P%lanlegg dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation>Importer CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation>Importer CS%V</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation>Importer fra divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation>Nytt dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation>Autogruppering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Forrige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Neste DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation>Høyre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Velg hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Legg inn plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
@@ -1199,11 +1184,6 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogboks</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation>Standardvalg</translation>
@@ -1411,11 +1391,6 @@ Fjern dem før du gjør dette.</translation>
         <translation>MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</translation>
@@ -1451,11 +1426,6 @@ Fjern dem før du gjør dette.</translation>
         <translation>Regn ut NDL/TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation>Vis SAC</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation>GF lav ved maksdybde</translation>
@@ -1466,6 +1436,21 @@ Fjern dem før du gjør dette.</translation>
         <translation>Ymse</translation>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Valg</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation>GF lav</translation>
@@ -1535,84 +1520,79 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation>Skjema</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation>Utskriftsvalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Skriv ut valgte dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Fargeutskrift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Utskriftstype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 dykk per side</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 dykk per side</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tabellutskrift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Sortering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil øverst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notater øverst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation>Størrelse på høyder (i % av layout)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation>Profilhøyder (43% - 85%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation>Høyde på andre data (8% - 17%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation>Notathøyde (0% -52%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation>0</translation>
     </message>
@@ -1676,30 +1656,30 @@ Fjern dem før du gjør dette.</translation>
         <translation>Rediger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bytter til OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> slutt</translation>
@@ -1781,12 +1761,12 @@ Fjern dem før du gjør dette.</translation>
         <translation>Fjern dette punktet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation>Ingen stedsdata - finn sted i kartet og dobbelklikk for å sette posisjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation>Redigerer dykk - finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
     </message>
@@ -1860,11 +1840,6 @@ Fjern dem før du gjør dette.</translation>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation>Tekstetikett</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
@@ -1921,11 +1896,6 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation>Skjema</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation>Legg til flaske</translation>
@@ -1940,19 +1910,19 @@ Fjern dem før du gjør dette.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
-        <translation>Ml</translation>
+        <source>ml</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informasjon</translation>
     </message>
@@ -2164,7 +2134,7 @@ Snitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
@@ -2173,8 +2143,8 @@ Snitt</translation>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -2308,13 +2278,14 @@ Snitt</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation>under tak</translation>
+        <source>divetime</source>
+        <translation>dykketid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>dykketid</translation>
+        <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="142"/>
@@ -2498,7 +2469,7 @@ Snitt</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 18c34d175..508946160 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation>Bestand Importeren (CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation>Scheiding tussen velden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation>Veld Configuratie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation>Po2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation>Cns</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation>Stop diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation>Vooraf ingestelde import</translation>
     </message>
@@ -277,48 +277,43 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation>Gasverbruik (bodem)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation>Gasverbruik tijdens decostop</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation>Starttijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation>Druk (atm)</translation>
     </message>
@@ -542,259 +537,254 @@ Verwijder deze eerst.</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation>TabWidget</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Duiknotities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation>Starttijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation>lucht / water temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation>Coördinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Duikleider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Uitrusting</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gebruikte gassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Gem. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Luchtdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Luchttemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Watertemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Duiktijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation>Gewichten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation>Gewichtssysteem toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation>Trip locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation>Trip Nota&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation>Deze trip wordt bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation>Meerdere duiken worden bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation>Deze duik wordt bewerkt. Kies Bewaren of Ongedaan maken als u klaar bent.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -802,341 +792,336 @@ Verwijder deze eerst.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation>HoofdScherm</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation>&amp;Importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nieuw logboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation>Logboek &amp;Openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation>Bewaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Opslaan als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation>Bestanden importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation>&amp;UDDF Exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation>Afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importeren uit &amp;duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>&amp;GPS gegevens importeren van Subsurface Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation>Namen toestellen wijzigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation>Hernummeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation>Zoom in-/uitschakelen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Jaarlijkse Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation>Duiklijst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation>Handleiding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation>Wereldbol</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation>Duik P&amp;lannen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation>CSV importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation>CS&amp;V importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation>Importeren van Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation>Duik Toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation>Automatisch Groeperen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Vorige DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Volgende DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>gebeurtenissen selecteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Voer plan in</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
@@ -1200,11 +1185,6 @@ Verwijder deze eerst.</translation>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation>Standaardinstellingen</translation>
@@ -1412,11 +1392,6 @@ Verwijder deze eerst.</translation>
         <translation>MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation>max PP02</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</translation>
@@ -1452,11 +1427,6 @@ Verwijder deze eerst.</translation>
         <translation>NDL/TTS Berekenen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation>Toon gasverbruik</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation>GFLow op max diepte</translation>
@@ -1467,6 +1437,21 @@ Verwijder deze eerst.</translation>
         <translation>Allerlei</translation>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
@@ -1536,84 +1521,79 @@ Verwijder deze eerst.</translation>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation>Afdrukopties</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Alleen geselecteerde duiken afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Afdrukken in kleur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Afdruktype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 duiken per bladzijde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 duiken per bladzijde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Afdrukken in tabelvorm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Volgorde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profiel bovenaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notities bovenaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation>Instellen hoogtes (% van opmaak)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation>Profiel hoogte (43% - 85%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation>Andere gegevens hoogte (8% - 17%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation>Nota&apos;s hoogte (0% - 52%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation>0</translation>
     </message>
@@ -1677,30 +1657,30 @@ Verwijder deze eerst.</translation>
         <translation>Bewerken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Schakel om naar OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> begin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> eind</translation>
@@ -1782,12 +1762,12 @@ Verwijder deze eerst.</translation>
         <translation>Dit punt verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation>Geen locatiegegevens - verplaats de kaart en dubbelklik om een duiklocatie te kiezen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation>Duik bewerken - verplaats de kaart en dubbelklik om de duiklocatie te selecteren</translation>
     </message>
@@ -1861,11 +1841,6 @@ Verwijder deze eerst.</translation>
         <translation>Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation>Tekstlabel</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
@@ -1922,11 +1897,6 @@ Verwijder deze eerst.</translation>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation>Fles toevoegen</translation>
@@ -1941,19 +1911,19 @@ Verwijder deze eerst.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
-        <translation>Ml</translation>
+        <source>ml</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
@@ -2165,7 +2135,7 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) of (%s)</translation>
     </message>
@@ -2174,8 +2144,8 @@ Maximum</translation>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
@@ -2309,13 +2279,14 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation>onder de vloer</translation>
+        <source>divetime</source>
+        <translation>duiktijd</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>duiktijd</translation>
+        <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="142"/>
@@ -2499,7 +2470,7 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 80c0366e7..faac82bc3 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Widoczność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Poprzedni komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Następny komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Wybór zdarzeń</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Wprowadź plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Drukuj tylko zaznaczone nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Drukuj w kolorze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Rodzaj wydruku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 nurkowań na stronę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 nurkowania na stronę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tabela</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Kolejność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil na górze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notatki na górze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Edytuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Przejście na obieg otwarty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> początek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> koniec</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>czas nurkowania</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>czas nurkowania</translation>
+        <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="142"/>
@@ -2487,7 +2458,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index 42366cc5a..be013048b 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -140,7 +140,7 @@
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="46"/>
         <source>Remove the selected Dive Computer?</source>
-        <translation type="unfinished"/>
+        <translation>Remover o computador de mergulho selecionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="47"/>
@@ -195,7 +195,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="634"/>
         <source>expand all</source>
-        <translation type="unfinished"/>
+        <translation>expandir todos</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="635"/>
@@ -260,7 +260,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Salvar aquivo como</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="701"/>
@@ -270,54 +270,49 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="650"/>
         <source>merge selected dives</source>
-        <translation type="unfinished"/>
+        <translation>mesclar mergulhos selecionados</translation>
     </message>
 </context>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -361,7 +356,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1071"/>
         <source>Duration</source>
-        <translation type="unfinished"/>
+        <translation>Duração</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.cpp" line="1072"/>
@@ -417,12 +412,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1142"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1143"/>
@@ -540,601 +535,591 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Instrutor de Mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Info do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
-        <translation type="unfinished"/>
+        <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
-        <translation type="unfinished"/>
+        <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
-        <translation type="unfinished"/>
+        <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Cilindros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
-        <translation type="unfinished"/>
+        <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
-        <translation type="unfinished"/>
+        <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
-        <translation type="unfinished"/>
+        <translation>L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
-        <translation type="unfinished"/>
+        <translation>O</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
-        <translation type="unfinished"/>
+        <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
-        <translation type="unfinished"/>
+        <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
-        <translation type="unfinished"/>
+        <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
-        <translation type="unfinished"/>
+        <translation>Salvar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
-        <translation type="unfinished"/>
+        <translation>Importar arquivos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
-        <translation type="unfinished"/>
+        <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1161,7 +1146,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="534"/>
         <source>Save Changes?</source>
-        <translation type="unfinished"/>
+        <translation>Salvar alterações?</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="535"/>
@@ -1172,7 +1157,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/mainwindow.cpp" line="196"/>
         <location filename="../qt-ui/mainwindow.cpp" line="724"/>
         <source>Save File as</source>
-        <translation type="unfinished"/>
+        <translation>Salvar aquivo como</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.cpp" line="107"/>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1225,7 +1205,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="132"/>
         <source>Font</source>
-        <translation type="unfinished"/>
+        <translation>Fonte</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="142"/>
@@ -1235,7 +1215,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="155"/>
         <source>Dives</source>
-        <translation type="unfinished"/>
+        <translation>Mergulhos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="161"/>
@@ -1265,17 +1245,17 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="241"/>
         <source>System</source>
-        <translation type="unfinished"/>
+        <translation>Sistema</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="248"/>
         <source>Metric</source>
-        <translation type="unfinished"/>
+        <translation>Métrico</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="258"/>
         <source>Imperial</source>
-        <translation type="unfinished"/>
+        <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="268"/>
@@ -1295,22 +1275,22 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="309"/>
         <source>Feet</source>
-        <translation type="unfinished"/>
+        <translation>Pés</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="319"/>
         <source>Pressure</source>
-        <translation type="unfinished"/>
+        <translation>Pressão</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="326"/>
         <source>Bar</source>
-        <translation type="unfinished"/>
+        <translation>Bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="336"/>
         <source>Psi</source>
-        <translation type="unfinished"/>
+        <translation>Psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="346"/>
@@ -1320,7 +1300,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="353"/>
         <source>Liter</source>
-        <translation type="unfinished"/>
+        <translation>Litro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="363"/>
@@ -1330,7 +1310,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="373"/>
         <source>Temperature</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="380"/>
@@ -1340,7 +1320,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="390"/>
         <source>Fahrenheit</source>
-        <translation type="unfinished"/>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="400"/>
@@ -1350,7 +1330,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="407"/>
         <source>Kg</source>
-        <translation type="unfinished"/>
+        <translation>Kg</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="417"/>
@@ -1370,12 +1350,12 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/preferences.ui" line="445"/>
         <source>Minutes</source>
-        <translation type="unfinished"/>
+        <translation>Minutos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="455"/>
         <source>Seconds</source>
-        <translation type="unfinished"/>
+        <translation>Segundos</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="487"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Preferências</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1513,7 +1498,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Duration</source>
-        <translation type="unfinished"/>
+        <translation>Duração</translation>
     </message>
     <message>
         <location filename="../qt-ui/printlayout.cpp" line="28"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 mergulhos por página</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
-        <translation type="unfinished"/>
+        <translation>2 mergulhos por página</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Perfil no topo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notas no topo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1621,7 +1601,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="200"/>
         <source>Hide events</source>
-        <translation type="unfinished"/>
+        <translation>Ocultar eventos</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="201"/>
@@ -1642,7 +1622,7 @@ Please, remove them first.</source>
         <location filename="../qt-ui/profilegraphics.cpp" line="387"/>
         <location filename="../qt-ui/profilegraphics.cpp" line="389"/>
         <source>unknown divecomputer</source>
-        <translation type="unfinished"/>
+        <translation>computador de mergulho desconhecido</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="467"/>
@@ -1652,7 +1632,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="513"/>
         <source>Scale</source>
-        <translation type="unfinished"/>
+        <translation>Escala</translation>
     </message>
     <message>
         <location filename="../qt-ui/profilegraphics.cpp" line="514"/>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>início</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
@@ -1709,7 +1689,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="1615"/>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation>desconhecido</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="1620"/>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1802,7 +1782,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Minimum</source>
-        <translation type="unfinished"/>
+        <translation>Mínimo</translation>
     </message>
     <message>
         <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1935,25 +1905,25 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Descrição</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
-        <translation type="unfinished"/>
+        <source>ml</source>
+        <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation type="unfinished"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
-        <translation type="unfinished"/>
+        <translation>Informação</translation>
     </message>
 </context>
 <context>
@@ -1961,7 +1931,7 @@ Please, remove them first.</source>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Descrição</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="633"/>
@@ -2108,13 +2078,13 @@ Maximum</source>
         <location filename="../dive.c" line="61"/>
         <location filename="../qt-gui.cpp" line="322"/>
         <source>bar</source>
-        <translation type="unfinished"/>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../dive.c" line="65"/>
         <location filename="../qt-gui.cpp" line="325"/>
         <source>psi</source>
-        <translation type="unfinished"/>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../dive.c" line="101"/>
@@ -2132,13 +2102,13 @@ Maximum</source>
         <location filename="../dive.c" line="134"/>
         <location filename="../qt-gui.cpp" line="206"/>
         <source>m</source>
-        <translation type="unfinished"/>
+        <translation>m</translation>
     </message>
     <message>
         <location filename="../dive.c" line="139"/>
         <location filename="../qt-gui.cpp" line="209"/>
         <source>ft</source>
-        <translation type="unfinished"/>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../dive.c" line="183"/>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
@@ -2247,7 +2217,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>transmitter</source>
-        <translation type="unfinished"/>
+        <translation>transmissor</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
@@ -2262,7 +2232,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
         <source>surface</source>
-        <translation type="unfinished"/>
+        <translation>superfície</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="139"/>
@@ -2297,12 +2267,13 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
+        <source>divetime</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
+        <source>below floor</source>
+        <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2318,7 +2289,7 @@ Maximum</source>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
         <source>PO2</source>
-        <translation type="unfinished"/>
+        <translation>PO2</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="142"/>
@@ -2482,7 +2453,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation type="unfinished"/>
     </message>
@@ -2843,7 +2814,7 @@ TTS:%umin (calc)</source>
     <message>
         <location filename="../dive.c" line="18"/>
         <source>instructor</source>
-        <translation type="unfinished"/>
+        <translation>instrutor</translation>
     </message>
     <message>
         <location filename="../dive.c" line="19"/>
@@ -3013,7 +2984,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../uemis-downloader.c" line="106"/>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation>desconhecido</translation>
     </message>
     <message>
         <location filename="../uemis-downloader.c" line="357"/>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index e8d246354..c79ee5764 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informação do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Guardar como...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Anterior DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Seguinte DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Seleccionar Eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Introduzir Plano</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Sobre Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Preferências</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Imprimir apenas mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Imprimir a cores</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Tipo de impressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 imersões por página</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 mergulhos por página</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Imprimir tabela</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Ordenar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Perfil no topo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Notas no topo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Troca de emergência para OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>iniciar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>Sobre Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>duração do mergulho</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>duração do mergulho</translation>
+        <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="142"/>
@@ -2488,7 +2459,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 90f16ac9f..33d407f21 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation>Файл CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation>Разделитель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation>Положение полей</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Темп.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation>Шаблоны</translation>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Погружение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation>Начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation>Температура воздуха / воды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation>Координаты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Инструктор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Видимость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Снаряжение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Ср. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Давление воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Температура воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Температура воды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Время погр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Общее время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation>Добавить баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation>Грузы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation>Добавить груз</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>В</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>З</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation>Журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation>Новый журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation>Импорт файлов</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation>Экспорт UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation>Импорт из компьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Импорт данных GPS из сервиса Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation>Статистика за год</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation>Руководство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation>Планировщик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation>Импорт CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation>Импорт CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation>Импорт с сайта Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Предпочтения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation>Добавить погружение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation>Авто-группировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Пред. ДК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation>Влево</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>След. ДК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation>Вправо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Выбрать события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Ввести план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>О Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation>Общие</translation>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation>MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation>макс PP02</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</translation>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation>Рассчитывать NDL/TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation>GFLow на макс. грубине</translation>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation>Разное</translation>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Предпочтения</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation>Параметры печати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Печать выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Цветная печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Настройки печати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 погр. на стр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 погр. на стр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Таблица</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Макет страницы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Профиль наверху</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Примечания наверху</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation>Высота элементов (% от макета)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation>Профиль (43% - 85%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation>Прочее (8% - 17%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation>Заметки (0% - 52%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Редактировать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Переход на Откр. Цикл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> конец</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>О Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation>Добавить баллон</translation>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>Бар</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
@@ -2160,7 +2130,7 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
@@ -2169,8 +2139,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>воздух</translation>
     </message>
@@ -2304,13 +2274,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>время погружения</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>время погружения</translation>
+        <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="142"/>
@@ -2494,7 +2465,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index f5eaf2409..a138ad133 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation type="unfinished"/>
     </message>
@@ -276,48 +276,43 @@
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -540,259 +535,254 @@ Please, remove them first.</source>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Viditeľnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Výstroj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Informácie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Čas Ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Štatistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Fľaše</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -800,341 +790,336 @@ Please, remove them first.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Uložiť ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Nastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Predchádzajúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Nasledujúci DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Voľba udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Plánovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
@@ -1198,11 +1183,6 @@ Please, remove them first.</source>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -1410,11 +1390,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation type="unfinished"/>
@@ -1450,11 +1425,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
@@ -1465,6 +1435,21 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Nastavenia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>Spotreba plynu</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
@@ -1534,84 +1519,79 @@ Please, remove them first.</source>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Tlačiť vybrané ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Farebná tlač</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Druh tlače</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 ponorov na stránku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 ponory na stránku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tlač tabuľky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Radenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil na vrchu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Poznámky na vrchu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation type="unfinished"/>
     </message>
@@ -1675,30 +1655,30 @@ Please, remove them first.</source>
         <translation>Editovať</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Záchrana na OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>začiatok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>koniec</translation>
@@ -1780,12 +1760,12 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
@@ -1859,11 +1839,6 @@ Please, remove them first.</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation type="unfinished"/>
@@ -1920,11 +1895,6 @@ Please, remove them first.</source>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation type="unfinished"/>
@@ -1939,19 +1909,19 @@ Please, remove them first.</source>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
+        <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -2153,7 +2123,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) alebo (%s)</translation>
     </message>
@@ -2162,8 +2132,8 @@ Maximum</source>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
@@ -2297,13 +2267,14 @@ Maximum</source>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation type="unfinished"/>
+        <source>divetime</source>
+        <translation>čas ponoru</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>čas ponoru</translation>
+        <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="142"/>
@@ -2487,7 +2458,7 @@ Maximum</source>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 07a33d7f0..641036f47 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -2,62 +2,62 @@
 <context>
     <name>CSVImportDialog</name>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="42"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="26"/>
         <source>Import File (CSV)</source>
         <translation>Importera fil (CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="35"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="124"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="192"/>
         <source>Field Separator</source>
         <translation>Fältavskiljare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="101"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="60"/>
         <source>Field Configuration</source>
         <translation>Fältkonfiguration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="117"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="14"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/csvimportdialog.ui" line="76"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="134"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="93"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="148"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="107"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="165"/>
-        <source>Po2</source>
-        <translation>Po2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="182"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="141"/>
         <source>Cns</source>
         <translation>Cns</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="199"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="158"/>
         <source>Stopdepth</source>
         <translation>Stoppdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.ui" line="227"/>
+        <location filename="../qt-ui/csvimportdialog.ui" line="210"/>
         <source>Pre-configured imports</source>
         <translation>Förkonfigurerade importer</translation>
     </message>
@@ -277,48 +277,43 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.ui" line="74"/>
+        <location filename="../qt-ui/diveplanner.ui" line="71"/>
         <source>Bottom SAC</source>
         <translation>Botten SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="88"/>
+        <location filename="../qt-ui/diveplanner.ui" line="85"/>
         <source>SAC on DECO Stop</source>
         <translation>SAC på DEKOSTOP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="81"/>
+        <location filename="../qt-ui/diveplanner.ui" line="78"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="101"/>
+        <location filename="../qt-ui/diveplanner.ui" line="98"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="108"/>
-        <location filename="../qt-ui/diveplanner.ui" line="121"/>
+        <location filename="../qt-ui/diveplanner.ui" line="105"/>
+        <location filename="../qt-ui/diveplanner.ui" line="118"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="131"/>
+        <location filename="../qt-ui/diveplanner.ui" line="128"/>
         <source>Last Stop at 6m</source>
         <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="180"/>
+        <location filename="../qt-ui/diveplanner.ui" line="177"/>
         <source>Start Time</source>
         <translation>Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="187"/>
+        <location filename="../qt-ui/diveplanner.ui" line="184"/>
         <source>ATM Pressure</source>
         <translation>Atmosfärstryck</translation>
     </message>
@@ -542,259 +537,254 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="14"/>
-        <source>TabWidget</source>
-        <translation>TabWidget</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Dive Notes</source>
         <translation>Dykanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="66"/>
+        <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Starttime</source>
         <translation>Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
+        <location filename="../qt-ui/maintab.ui" line="70"/>
         <source>air / water Temperatures</source>
         <translation>luft / vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.cpp" line="345"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.cpp" line="388"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="137"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="161"/>
+        <location filename="../qt-ui/maintab.ui" line="158"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="144"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="119"/>
+        <location filename="../qt-ui/maintab.ui" line="116"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="177"/>
+        <location filename="../qt-ui/maintab.ui" line="174"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../qt-ui/maintab.ui" line="181"/>
         <source>Visibility</source>
         <translation>Synlighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="200"/>
+        <location filename="../qt-ui/maintab.ui" line="197"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
-        <location filename="../qt-ui/maintab.cpp" line="346"/>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../qt-ui/maintab.cpp" line="389"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="261"/>
+        <location filename="../qt-ui/maintab.ui" line="258"/>
         <source>Equipment</source>
         <translation>Utrustning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="348"/>
+        <location filename="../qt-ui/maintab.ui" line="345"/>
         <source>Dive Info</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="390"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="409"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="428"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="447"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="466"/>
-        <location filename="../qt-ui/maintab.ui" line="721"/>
+        <location filename="../qt-ui/maintab.ui" line="463"/>
+        <location filename="../qt-ui/maintab.ui" line="718"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Lufttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dyktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salthalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="655"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="697"/>
+        <location filename="../qt-ui/maintab.ui" line="694"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="709"/>
+        <location filename="../qt-ui/maintab.ui" line="706"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../qt-ui/maintab.ui" line="730"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="745"/>
+        <location filename="../qt-ui/maintab.ui" line="742"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="764"/>
+        <location filename="../qt-ui/maintab.ui" line="761"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="69"/>
+        <location filename="../qt-ui/maintab.cpp" line="70"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="70"/>
+        <location filename="../qt-ui/maintab.cpp" line="71"/>
         <source>Add Cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="73"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Weights</source>
         <translation>Vikter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="74"/>
+        <location filename="../qt-ui/maintab.cpp" line="75"/>
         <source>Add Weight System</source>
         <translation>Lägg till Viktsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="317"/>
+        <location filename="../qt-ui/maintab.cpp" line="360"/>
         <source>Trip Location</source>
         <translation>Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="296"/>
-        <location filename="../qt-ui/maintab.cpp" line="319"/>
+        <location filename="../qt-ui/maintab.cpp" line="339"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Trip Notes</source>
         <translation>Resmålsanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="134"/>
-        <location filename="../qt-ui/maintab.cpp" line="136"/>
+        <location filename="../qt-ui/maintab.cpp" line="177"/>
+        <location filename="../qt-ui/maintab.cpp" line="179"/>
         <source>This trip is being edited. Select Save or Cancel when done.</source>
         <translation>Detta resmål håller på och ändras, välj Spara eller Avbryt när du är klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="143"/>
-        <location filename="../qt-ui/maintab.cpp" line="144"/>
+        <location filename="../qt-ui/maintab.cpp" line="186"/>
+        <location filename="../qt-ui/maintab.cpp" line="187"/>
         <source>Multiple dives are being edited. Select Save or Cancel when done.</source>
         <translation>Flera dyk håller på och ändras. Välj Spara eller Avbryt när du är klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="146"/>
-        <location filename="../qt-ui/maintab.cpp" line="147"/>
+        <location filename="../qt-ui/maintab.cpp" line="189"/>
+        <location filename="../qt-ui/maintab.cpp" line="190"/>
         <source>This dive is being edited. Select Save or Cancel when done.</source>
         <translation>Detta dyk håller på och ändras. Välj Spara eller Avbryt när du är klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
-        <location filename="../qt-ui/maintab.cpp" line="370"/>
-        <location filename="../qt-ui/maintab.cpp" line="399"/>
-        <location filename="../qt-ui/maintab.cpp" line="400"/>
-        <location filename="../qt-ui/maintab.cpp" line="401"/>
+        <location filename="../qt-ui/maintab.cpp" line="405"/>
+        <location filename="../qt-ui/maintab.cpp" line="413"/>
+        <location filename="../qt-ui/maintab.cpp" line="442"/>
+        <location filename="../qt-ui/maintab.cpp" line="443"/>
+        <location filename="../qt-ui/maintab.cpp" line="444"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="364"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="854"/>
+        <location filename="../qt-ui/maintab.cpp" line="897"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="855"/>
+        <location filename="../qt-ui/maintab.cpp" line="898"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -802,341 +792,336 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation>Huvudfönster</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="218"/>
+        <location filename="../qt-ui/mainwindow.ui" line="215"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="177"/>
+        <location filename="../qt-ui/mainwindow.ui" line="174"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="192"/>
+        <location filename="../qt-ui/mainwindow.ui" line="189"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="200"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../qt-ui/mainwindow.ui" line="228"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="248"/>
+        <location filename="../qt-ui/mainwindow.ui" line="245"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny Loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../qt-ui/mainwindow.ui" line="248"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../qt-ui/mainwindow.ui" line="256"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Öppna loggbok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="262"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="265"/>
+        <location filename="../qt-ui/mainwindow.ui" line="262"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="270"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
         <source>&amp;Save</source>
         <translation>&amp;Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="273"/>
+        <location filename="../qt-ui/mainwindow.ui" line="270"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../qt-ui/mainwindow.ui" line="273"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="278"/>
         <location filename="../qt-ui/mainwindow.ui" line="281"/>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Save as</source>
         <translation>Spara som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../qt-ui/mainwindow.ui" line="284"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="289"/>
         <location filename="../qt-ui/mainwindow.ui" line="292"/>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="298"/>
+        <location filename="../qt-ui/mainwindow.ui" line="295"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
+        <location filename="../qt-ui/mainwindow.ui" line="300"/>
         <location filename="../qt-ui/mainwindow.ui" line="303"/>
-        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <location filename="../qt-ui/mainwindow.cpp" line="167"/>
         <source>Import Files</source>
         <translation>Importera filer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../qt-ui/mainwindow.ui" line="306"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="314"/>
+        <location filename="../qt-ui/mainwindow.ui" line="311"/>
         <source>Export &amp;UDDF</source>
         <translation>Exportera &amp;UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../qt-ui/mainwindow.ui" line="314"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="322"/>
+        <location filename="../qt-ui/mainwindow.ui" line="319"/>
         <source>&amp;Print</source>
         <translation>&amp;Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../qt-ui/mainwindow.ui" line="330"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="338"/>
+        <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="346"/>
+        <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
         <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="354"/>
+        <location filename="../qt-ui/mainwindow.ui" line="351"/>
         <source>Import &amp;GPS data from Subsurface Service</source>
         <translation>Importera &amp;GPSdata från Subsurface webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../qt-ui/mainwindow.ui" line="354"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="362"/>
+        <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
         <translation>&amp;Ändra Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="367"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="372"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumrering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="375"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="388"/>
         <source>Toggle &amp;Zoom</source>
         <translation>Zoom av/på</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="393"/>
         <source>&amp;Yearly Statistics</source>
         <translation>&amp;Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="396"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="401"/>
         <source>Dive List</source>
         <translation>Dyklista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="409"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="420"/>
+        <location filename="../qt-ui/mainwindow.ui" line="417"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="425"/>
         <source>All</source>
         <translation>Alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="467"/>
+        <location filename="../qt-ui/mainwindow.ui" line="464"/>
         <source>User &amp;Manual</source>
         <translation>&amp;Användarmanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="475"/>
+        <location filename="../qt-ui/mainwindow.ui" line="472"/>
         <source>Globe</source>
         <translation>Glob</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="483"/>
+        <location filename="../qt-ui/mainwindow.ui" line="480"/>
         <source>P&amp;lan Dive</source>
         <translation>Pl&amp;anera Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../qt-ui/mainwindow.ui" line="483"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="491"/>
+        <location filename="../qt-ui/mainwindow.ui" line="488"/>
         <source>Import CSV</source>
         <translation>Importera CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="494"/>
+        <location filename="../qt-ui/mainwindow.ui" line="491"/>
         <source>Import CS&amp;V</source>
         <translation>Importera CS&amp;V</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="499"/>
+        <location filename="../qt-ui/mainwindow.ui" line="496"/>
         <source>Import from Divelogs.de</source>
         <translation>Import från Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../qt-ui/mainwindow.ui" line="322"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="330"/>
+        <location filename="../qt-ui/mainwindow.ui" line="327"/>
         <source>Preferences</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../qt-ui/mainwindow.ui" line="338"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../qt-ui/mainwindow.ui" line="346"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="364"/>
         <source>Add Dive</source>
         <translation>Nytt dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="386"/>
+        <location filename="../qt-ui/mainwindow.ui" line="383"/>
         <source>Auto Group</source>
         <translation>Autogruppering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="404"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="412"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="420"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="428"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="433"/>
         <source>Prev DC</source>
         <translation>Föregående dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="436"/>
         <source>Left</source>
         <translation>Vänster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="441"/>
         <source>Next DC</source>
         <translation>Nästa dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="444"/>
         <source>Right</source>
         <translation>Höger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="449"/>
         <source>Select Events</source>
         <translation>Välj händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../qt-ui/mainwindow.ui" line="454"/>
         <source>Input Plan</source>
         <translation>Skriv plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../qt-ui/mainwindow.ui" line="459"/>
         <source>About Subsurface</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="470"/>
+        <location filename="../qt-ui/mainwindow.ui" line="467"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="478"/>
+        <location filename="../qt-ui/mainwindow.ui" line="475"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
@@ -1200,11 +1185,6 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="80"/>
         <source>Defaults</source>
         <translation>Standardvärden</translation>
@@ -1412,11 +1392,6 @@ vänligen ta bort dessa först.</translation>
         <translation>MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="641"/>
-        <source>max PP02</source>
-        <translation>max PP02</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="657"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</translation>
@@ -1452,11 +1427,6 @@ vänligen ta bort dessa först.</translation>
         <translation>Beräkna NDL/TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
-        <source>Show SAC</source>
-        <translation>Visa SAC</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="792"/>
         <source>GFLow at max depth</source>
         <translation>GFLow på maxdjup</translation>
@@ -1467,6 +1437,21 @@ vänligen ta bort dessa först.</translation>
         <translation>Blandat</translation>
     </message>
     <message>
+        <location filename="../qt-ui/preferences.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Inställningar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="641"/>
+        <source>max PPO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/preferences.ui" line="772"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
@@ -1536,84 +1521,79 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="26"/>
+        <location filename="../qt-ui/printoptions.ui" line="23"/>
         <source>Print options</source>
         <translation>Utskriftsoptioner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="44"/>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
         <source>Print only selected dives</source>
         <translation>Skriv ut valda dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="63"/>
+        <location filename="../qt-ui/printoptions.ui" line="60"/>
         <source>Print in color</source>
         <translation>Skriv ut i färg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="89"/>
+        <location filename="../qt-ui/printoptions.ui" line="86"/>
         <source>Print type</source>
         <translation>Utskriftstyp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="119"/>
+        <location filename="../qt-ui/printoptions.ui" line="116"/>
         <source>6 dives per page</source>
         <translation>6 dyk per sida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="135"/>
+        <location filename="../qt-ui/printoptions.ui" line="132"/>
         <source>2 dives per page</source>
         <translation>2 dyk per sida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../qt-ui/printoptions.ui" line="145"/>
         <source>Table print</source>
         <translation>Tabellutskrift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="165"/>
+        <location filename="../qt-ui/printoptions.ui" line="162"/>
         <source>Ordering</source>
         <translation>Sortering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="183"/>
+        <location filename="../qt-ui/printoptions.ui" line="180"/>
         <source>Profile on top</source>
         <translation>Profil ovanpå</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="205"/>
+        <location filename="../qt-ui/printoptions.ui" line="202"/>
         <source>Notes on top</source>
         <translation>Anteckningar ovanpå</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="222"/>
+        <location filename="../qt-ui/printoptions.ui" line="219"/>
         <source>Sizing heights (% of layout)</source>
         <translation>Dimensionering av höjder (% av layout)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="259"/>
+        <location filename="../qt-ui/printoptions.ui" line="256"/>
         <source>Profile height (43% - 85%)</source>
         <translation>Profilhöjd (43% - 85%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="281"/>
+        <location filename="../qt-ui/printoptions.ui" line="278"/>
         <source>Other data height (8% - 17%)</source>
         <translation>Höjd på övriga uppgifter (8% - 17%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="341"/>
+        <location filename="../qt-ui/printoptions.ui" line="338"/>
         <source>Notes height (0% - 52%)</source>
         <translation>Anteckningar höjd (0% - 52%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="357"/>
-        <location filename="../qt-ui/printoptions.ui" line="373"/>
-        <location filename="../qt-ui/printoptions.ui" line="389"/>
+        <location filename="../qt-ui/printoptions.ui" line="354"/>
+        <location filename="../qt-ui/printoptions.ui" line="370"/>
+        <location filename="../qt-ui/printoptions.ui" line="386"/>
         <source>0</source>
         <translation>0</translation>
     </message>
@@ -1677,30 +1657,30 @@ vänligen ta bort dessa först.</translation>
         <translation>Redigera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="723"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="975"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="725"/>
-        <location filename="../qt-ui/profilegraphics.cpp" line="977"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
         <source>EAN%1</source>
         <translation>EAN%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="985"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
         <source>Bailing out to OC</source>
         <translation>Bailout till öppet system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="987"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="988"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
@@ -1782,12 +1762,12 @@ vänligen ta bort dessa först.</translation>
         <translation>Ta bort denna punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="235"/>
+        <location filename="../qt-ui/globe.cpp" line="239"/>
         <source>No location data - move the map and double-click to set the dive location</source>
         <translation>Inga platsuppgifter - flytta kartan och dubbelklicka för att ställa in dykplats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="247"/>
+        <location filename="../qt-ui/globe.cpp" line="251"/>
         <source>Editing dive - move the map and double-click to set the dive location</source>
         <translation>Ändra dyk - Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation>
     </message>
@@ -1861,11 +1841,6 @@ vänligen ta bort dessa först.</translation>
         <translation>Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.ui" line="64"/>
-        <source>TextLabel</source>
-        <translation>Textettikett</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/about.cpp" line="18"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </source>
         <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface </translation>
@@ -1922,11 +1897,6 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/tableview.cpp" line="26"/>
         <source>Add Cylinder</source>
         <translation>Lägg till flaska</translation>
@@ -1941,19 +1911,19 @@ vänligen ta bort dessa först.</translation>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Ml</source>
-        <translation>Ml</translation>
+        <source>ml</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/models.cpp" line="761"/>
-        <source>Bar</source>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profilegraphics.cpp" line="1519"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -2162,7 +2132,7 @@ Medel</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1041"/>
+        <location filename="../dive.c" line="1051"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
@@ -2171,8 +2141,8 @@ Medel</translation>
         <location filename="../planner.c" line="96"/>
         <location filename="../planner.c" line="774"/>
         <location filename="../planner.c" line="775"/>
-        <location filename="../statistics.c" line="381"/>
-        <location filename="../statistics.c" line="392"/>
+        <location filename="../statistics.c" line="357"/>
+        <location filename="../statistics.c" line="368"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
@@ -2306,13 +2276,14 @@ Medel</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>below floor</source>
-        <translation>under golv</translation>
+        <source>divetime</source>
+        <translation>dyktid</translation>
     </message>
     <message>
         <location filename="../libdivecomputer.c" line="141"/>
-        <source>divetime</source>
-        <translation>dyktid</translation>
+        <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="142"/>
@@ -2496,7 +2467,7 @@ Medel</translation>
     </message>
     <message>
         <location filename="../planner.c" line="98"/>
-        <location filename="../statistics.c" line="385"/>
+        <location filename="../statistics.c" line="361"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
author	Dirk Hohndel <dirk@hohndel.org>	2013-11-29 12:14:25 -0800
committer	Dirk Hohndel <dirk@hohndel.org>	2013-11-29 12:14:25 -0800
commit	31f64e9b484bbd427ac2b4b9c4c4bd1d2a03b5b2 (patch)
tree	63b8c46d68088ad0d916c43258565a9c91f3d644
parent	bc9a09a81420b8e2ef2d218bcbd5c518263eff67 (diff)
download	subsurface-31f64e9b484bbd427ac2b4b9c4c4bd1d2a03b5b2.tar.gz